Skip to content

Commit

Permalink
v2.0.8
Browse files Browse the repository at this point in the history
- Dart `2.16`:
  - Organize imports.
  - Fix new lints.
- sdk: '>=2.15.0 <3.0.0'
- json_render: ^2.0.2
- dom_tools: ^2.1.0
- mercury_client: ^2.1.3
- args: ^2.3.0
  • Loading branch information
gmpassos committed Mar 6, 2022
1 parent 6720b52 commit 49aca6c
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 15 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
- Organize imports.
- Fix new lints.
- sdk: '>=2.15.0 <3.0.0'
- json_render: ^2.0.2
- dom_tools: ^2.1.0
- mercury_client: ^2.1.3
- args: ^2.3.0

## 2.0.7

Expand Down
2 changes: 1 addition & 1 deletion lib/src/bones_ui_component.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1238,7 +1238,7 @@ abstract class UIComponent extends UIEventHandler {
} else if (value is Map ||
(value is List && listMatchesAll(value, (dynamic e) => e is Map))) {
var jsonRender = JSONRender.fromJSON(value)
..renderMode = JSONRenderMode.VIEW
..renderMode = JSONRenderMode.view
..addAllKnownTypeRenders();
return jsonRender.render();
} else if (value is Iterable && value is! List) {
Expand Down
4 changes: 2 additions & 2 deletions lib/src/bones_ui_explorer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -686,9 +686,9 @@ class _ViewerRender {
var mode = config.getPropertyAsStringTrimLC('mode');

if (mode == 'input') {
jsonRender.renderMode = JSONRenderMode.INPUT;
jsonRender.renderMode = JSONRenderMode.input;
} else if (mode == 'view') {
jsonRender.renderMode = JSONRenderMode.VIEW;
jsonRender.renderMode = JSONRenderMode.view;
}

jsonRender.addAllKnownTypeRenders();
Expand Down
14 changes: 7 additions & 7 deletions lib/src/component/color_picker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class UIColorPicker extends UIComponent {
Color? _baseColor;

set color(Color? color) {
color ??= Color.BLACK;
color ??= Color.black;

_color = color;
_hsvColor = HSVColor.fromColor(color);
Expand All @@ -223,7 +223,7 @@ class UIColorPicker extends UIComponent {
}

set hsvColor(HSVColor? hsvColor) {
hsvColor ??= HSVColor.fromColor(Color.BLACK);
hsvColor ??= HSVColor.fromColor(Color.black);

_color = hsvColor.toColor();
_hsvColor = hsvColor;
Expand All @@ -236,7 +236,7 @@ class UIColorPicker extends UIComponent {
}

set hslColor(HSLColor? hsvColor) {
hsvColor ??= HSLColor.fromColor(Color.BLACK);
hsvColor ??= HSLColor.fromColor(Color.black);

_color = hsvColor.toColor();
_hsvColor = HSVColor.fromColor(_color!);
Expand Down Expand Up @@ -383,9 +383,9 @@ class UIColorPicker extends UIComponent {
_square!.onMouseUp.listen(_squareUp);
_square!.onMouseMove.listen(_squareDrag);

redirect_onTouchStart_to_MouseEvent(_square!);
redirectOnTouchStartToMouseEvent(_square!);
_square!.onTouchEnd.listen(_squareUp);
redirect_onTouchMove_to_MouseEvent(_square!);
redirectOnTouchMoveToMouseEvent(_square!);

_square!.onClick.listen(_squareClick);

Expand All @@ -397,7 +397,7 @@ class UIColorPicker extends UIComponent {

_luma!.onTouchStart.listen(_lumaDown);
_luma!.onTouchEnd.listen(_lumaUp);
redirect_onTouchMove_to_MouseEvent(_luma!);
redirectOnTouchMoveToMouseEvent(_luma!);

_luma!.onClick.listen(_lumaClick);

Expand All @@ -409,7 +409,7 @@ class UIColorPicker extends UIComponent {

_saturation!.onTouchStart.listen(_saturationDown);
_saturation!.onTouchEnd.listen(_saturationUp);
redirect_onTouchMove_to_MouseEvent(_saturation!);
redirectOnTouchMoveToMouseEvent(_saturation!);

_saturation!.onClick.listen(_saturationClick);

Expand Down
2 changes: 1 addition & 1 deletion lib/src/component/menu.dart
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ class UIPopupMenu extends UIComponent {
}
}

return '$CSS_MAX_Z_INDEX';
return '$cssMaxZIndex';
}

Point? get renderPoint {
Expand Down
8 changes: 4 additions & 4 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ dependencies:
dynamic_call: ^2.0.1
mercury_client: ^2.1.3
intl_messages: ^2.0.1
dom_tools: ^2.0.1
dom_tools: ^2.1.0
dom_builder: ^2.0.8
json_render: ^2.0.1
json_render: ^2.0.2
json_object_mapper: ^2.0.0
html_unescape: ^2.0.0
intl: ^0.17.0
Expand Down Expand Up @@ -46,12 +46,12 @@ dev_dependencies:
# path: ../mercury_client
# intl_messages:
# path: ../intl_messages
# amdjs:
# path: ../amdjs.dart
# dom_builder:
# path: ../dom_builder
# dom_tools:
# path: ../dom_tools
# dom_builder:
# path: ../dom_builder
# json_render:
# path: ../json_render
# json_object_mapper:
Expand Down

0 comments on commit 49aca6c

Please sign in to comment.