@nativescript/core 8.9.0-napi-es5.0 → 8.9.0-napi.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/abortcontroller/abortsignal.js +16 -23
- package/abortcontroller/abortsignal.js.map +1 -1
- package/abortcontroller/index.js +14 -20
- package/abortcontroller/index.js.map +1 -1
- package/accessibility/accessibility-common.js +8 -8
- package/accessibility/accessibility-common.js.map +1 -1
- package/accessibility/accessibility-css-helper.js +27 -27
- package/accessibility/accessibility-css-helper.js.map +1 -1
- package/accessibility/accessibility-properties.js +22 -23
- package/accessibility/accessibility-properties.js.map +1 -1
- package/accessibility/accessibility-service-common.js +12 -22
- package/accessibility/accessibility-service-common.js.map +1 -1
- package/accessibility/accessibility-service.android.js +27 -39
- package/accessibility/accessibility-service.android.js.map +1 -1
- package/accessibility/accessibility-service.ios.js +14 -17
- package/accessibility/accessibility-service.ios.js.map +1 -1
- package/accessibility/font-scale-common.js +2 -2
- package/accessibility/font-scale-common.js.map +1 -1
- package/accessibility/font-scale.android.js +7 -8
- package/accessibility/font-scale.android.js.map +1 -1
- package/accessibility/font-scale.ios.js +9 -10
- package/accessibility/font-scale.ios.js.map +1 -1
- package/accessibility/index.android.js +77 -83
- package/accessibility/index.android.js.map +1 -1
- package/accessibility/index.ios.js +34 -36
- package/accessibility/index.ios.js.map +1 -1
- package/animation-frame/animation-native.ios.js +1 -1
- package/animation-frame/animation-native.ios.js.map +1 -1
- package/animation-frame/index.js +16 -16
- package/animation-frame/index.js.map +1 -1
- package/application/application-common.js +196 -214
- package/application/application-common.js.map +1 -1
- package/application/application-shims.js +39 -39
- package/application/application-shims.js.map +1 -1
- package/application/application.android.js +110 -149
- package/application/application.android.js.map +1 -1
- package/application/application.ios.js +162 -197
- package/application/application.ios.js.map +1 -1
- package/application-settings/index.android.js +11 -11
- package/application-settings/index.android.js.map +1 -1
- package/application-settings/index.ios.js +1 -1
- package/application-settings/index.ios.js.map +1 -1
- package/bundle-entry-points.js +1 -1
- package/bundle-entry-points.js.map +1 -1
- package/color/color-common.js +157 -200
- package/color/color-common.js.map +1 -1
- package/color/index.android.js +4 -14
- package/color/index.android.js.map +1 -1
- package/color/index.ios.js +14 -24
- package/color/index.ios.js.map +1 -1
- package/color/known-colors.js +144 -144
- package/color/known-colors.js.map +1 -1
- package/connectivity/index.android.js +23 -23
- package/connectivity/index.android.js.map +1 -1
- package/connectivity/index.ios.js +25 -25
- package/connectivity/index.ios.js.map +1 -1
- package/console/index.js +20 -24
- package/console/index.js.map +1 -1
- package/core-types/index.js +38 -38
- package/core-types/index.js.map +1 -1
- package/css/CSS3Parser.js +104 -106
- package/css/CSS3Parser.js.map +1 -1
- package/css/CSSNativeScript.js +29 -34
- package/css/CSSNativeScript.js.map +1 -1
- package/css/css-tree-parser.js.map +1 -1
- package/css/parser.js +158 -178
- package/css/parser.js.map +1 -1
- package/css/system-classes.js +9 -9
- package/css/system-classes.js.map +1 -1
- package/css-mediaquery/index.js +27 -29
- package/css-mediaquery/index.js.map +1 -1
- package/data/observable/index.js +115 -124
- package/data/observable/index.js.map +1 -1
- package/data/observable-array/index.js +119 -176
- package/data/observable-array/index.js.map +1 -1
- package/data/virtual-array/index.js +61 -74
- package/data/virtual-array/index.js.map +1 -1
- package/debugger/InspectorBackendCommands.js +137 -161
- package/debugger/InspectorBackendCommands.js.map +1 -1
- package/debugger/devtools-elements.common.js +20 -20
- package/debugger/devtools-elements.common.js.map +1 -1
- package/debugger/devtools-elements.js +2 -2
- package/debugger/devtools-elements.js.map +1 -1
- package/debugger/dom-node.js +61 -73
- package/debugger/dom-node.js.map +1 -1
- package/debugger/index.js +19 -19
- package/debugger/index.js.map +1 -1
- package/debugger/webinspector-css.js +25 -30
- package/debugger/webinspector-css.js.map +1 -1
- package/debugger/webinspector-dom.js +38 -43
- package/debugger/webinspector-dom.js.map +1 -1
- package/debugger/webinspector-network.android.js +103 -132
- package/debugger/webinspector-network.android.js.map +1 -1
- package/debugger/webinspector-network.ios.js +100 -128
- package/debugger/webinspector-network.ios.js.map +1 -1
- package/file-system/file-system-access.android.js +414 -421
- package/file-system/file-system-access.android.js.map +1 -1
- package/file-system/file-system-access.ios.js +203 -213
- package/file-system/file-system-access.ios.js.map +1 -1
- package/file-system/index.js +294 -372
- package/file-system/index.js.map +1 -1
- package/fps-meter/fps-native.android.js +15 -18
- package/fps-meter/fps-native.android.js.map +1 -1
- package/fps-meter/fps-native.ios.js +9 -11
- package/fps-meter/fps-native.ios.js.map +1 -1
- package/fps-meter/index.js +11 -11
- package/fps-meter/index.js.map +1 -1
- package/globals/index.js +88 -112
- package/globals/index.js.map +1 -1
- package/http/http-request/http-request-common.js +5 -5
- package/http/http-request/http-request-common.js.map +1 -1
- package/http/http-request/index.android.js +53 -54
- package/http/http-request/index.android.js.map +1 -1
- package/http/http-request/index.ios.js +56 -58
- package/http/http-request/index.ios.js.map +1 -1
- package/http/index.js +19 -19
- package/http/index.js.map +1 -1
- package/image-asset/image-asset-common.js +25 -37
- package/image-asset/image-asset-common.js.map +1 -1
- package/image-asset/index.android.js +17 -25
- package/image-asset/index.android.js.map +1 -1
- package/image-asset/index.ios.js +25 -35
- package/image-asset/index.ios.js.map +1 -1
- package/image-source/image-source-common.js +2 -2
- package/image-source/image-source-common.js.map +1 -1
- package/image-source/index.android.js +152 -178
- package/image-source/index.android.js.map +1 -1
- package/image-source/index.ios.js +177 -203
- package/image-source/index.ios.js.map +1 -1
- package/index.js +4 -8
- package/index.js.map +1 -1
- package/matrix/index.js +17 -27
- package/matrix/index.js.map +1 -1
- package/media-query-list/index.js +61 -87
- package/media-query-list/index.js.map +1 -1
- package/module-name-resolver/index.js +21 -24
- package/module-name-resolver/index.js.map +1 -1
- package/module-name-resolver/non-bundle-workflow-compat.js +24 -24
- package/module-name-resolver/non-bundle-workflow-compat.js.map +1 -1
- package/module-name-resolver/qualifier-matcher/index.js +46 -46
- package/module-name-resolver/qualifier-matcher/index.js.map +1 -1
- package/package.json +1 -1
- package/platform/common.js +5 -5
- package/platform/common.js.map +1 -1
- package/platform/device/index.android.js +68 -107
- package/platform/device/index.android.js.map +1 -1
- package/platform/device/index.ios.js +62 -101
- package/platform/device/index.ios.js.map +1 -1
- package/platform/screen/index.android.js +32 -63
- package/platform/screen/index.android.js.map +1 -1
- package/platform/screen/index.ios.js +29 -60
- package/platform/screen/index.ios.js.map +1 -1
- package/profiling/index.js +40 -47
- package/profiling/index.js.map +1 -1
- package/text/text-common.js +36 -49
- package/text/text-common.js.map +1 -1
- package/timer/index.android.js +20 -30
- package/timer/index.android.js.map +1 -1
- package/timer/index.ios.js +12 -22
- package/timer/index.ios.js.map +1 -1
- package/trace/index.js +26 -36
- package/trace/index.js.map +1 -1
- package/ui/action-bar/action-bar-common.js +193 -252
- package/ui/action-bar/action-bar-common.js.map +1 -1
- package/ui/action-bar/index.android.js +170 -212
- package/ui/action-bar/index.android.js.map +1 -1
- package/ui/action-bar/index.ios.js +208 -251
- package/ui/action-bar/index.ios.js.map +1 -1
- package/ui/activity-indicator/activity-indicator-common.js +6 -11
- package/ui/activity-indicator/activity-indicator-common.js.map +1 -1
- package/ui/activity-indicator/index.android.js +20 -26
- package/ui/activity-indicator/index.android.js.map +1 -1
- package/ui/activity-indicator/index.ios.js +23 -31
- package/ui/activity-indicator/index.ios.js.map +1 -1
- package/ui/animation/animation-common.js +43 -50
- package/ui/animation/animation-common.js.map +1 -1
- package/ui/animation/animation-interfaces.js +3 -5
- package/ui/animation/animation-interfaces.js.map +1 -1
- package/ui/animation/index.android.js +90 -94
- package/ui/animation/index.android.js.map +1 -1
- package/ui/animation/index.ios.js +225 -191
- package/ui/animation/index.ios.js.map +1 -1
- package/ui/animation/keyframe-animation.js +67 -89
- package/ui/animation/keyframe-animation.js.map +1 -1
- package/ui/builder/binding-builder.js +31 -31
- package/ui/builder/binding-builder.js.map +1 -1
- package/ui/builder/component-builder/index.js +37 -37
- package/ui/builder/component-builder/index.js.map +1 -1
- package/ui/builder/index.js +54 -59
- package/ui/builder/index.js.map +1 -1
- package/ui/builder/xml2ui.js +128 -158
- package/ui/builder/xml2ui.js.map +1 -1
- package/ui/button/button-common.js +18 -25
- package/ui/button/button-common.js.map +1 -1
- package/ui/button/index.android.js +69 -80
- package/ui/button/index.android.js.map +1 -1
- package/ui/button/index.ios.js +103 -114
- package/ui/button/index.ios.js.map +1 -1
- package/ui/content-view/index.js +60 -78
- package/ui/content-view/index.js.map +1 -1
- package/ui/core/bindable/bindable-expressions.js +93 -101
- package/ui/core/bindable/bindable-expressions.js.map +1 -1
- package/ui/core/bindable/bindable-resources.js +1 -1
- package/ui/core/bindable/index.js +136 -141
- package/ui/core/bindable/index.js.map +1 -1
- package/ui/core/control-state-change/index.android.js +5 -7
- package/ui/core/control-state-change/index.android.js.map +1 -1
- package/ui/core/control-state-change/index.ios.js +9 -13
- package/ui/core/control-state-change/index.ios.js.map +1 -1
- package/ui/core/properties/index.js +440 -489
- package/ui/core/properties/index.js.map +1 -1
- package/ui/core/view/index.android.js +348 -384
- package/ui/core/view/index.android.js.map +1 -1
- package/ui/core/view/index.ios.js +364 -400
- package/ui/core/view/index.ios.js.map +1 -1
- package/ui/core/view/view-common.js +655 -944
- package/ui/core/view/view-common.js.map +1 -1
- package/ui/core/view/view-helper/index.android.js +15 -19
- package/ui/core/view/view-helper/index.android.js.map +1 -1
- package/ui/core/view/view-helper/index.ios.js +81 -85
- package/ui/core/view/view-helper/index.ios.js.map +1 -1
- package/ui/core/view/view-helper/view-helper-common.js +44 -49
- package/ui/core/view/view-helper/view-helper-common.js.map +1 -1
- package/ui/core/view-base/index.js +371 -426
- package/ui/core/view-base/index.js.map +1 -1
- package/ui/core/weak-event-listener/index.js +25 -26
- package/ui/core/weak-event-listener/index.js.map +1 -1
- package/ui/date-picker/date-picker-common.js +30 -35
- package/ui/date-picker/date-picker-common.js.map +1 -1
- package/ui/date-picker/index.android.js +43 -51
- package/ui/date-picker/index.android.js.map +1 -1
- package/ui/date-picker/index.ios.js +51 -61
- package/ui/date-picker/index.ios.js.map +1 -1
- package/ui/dialogs/dialogs-common.js +18 -18
- package/ui/dialogs/dialogs-common.js.map +1 -1
- package/ui/dialogs/index.android.js +86 -98
- package/ui/dialogs/index.android.js.map +1 -1
- package/ui/dialogs/index.ios.js +67 -80
- package/ui/dialogs/index.ios.js.map +1 -1
- package/ui/editable-text-base/editable-text-base-common.js +29 -35
- package/ui/editable-text-base/editable-text-base-common.js.map +1 -1
- package/ui/editable-text-base/index.android.js +106 -112
- package/ui/editable-text-base/index.android.js.map +1 -1
- package/ui/editable-text-base/index.ios.js +47 -53
- package/ui/editable-text-base/index.ios.js.map +1 -1
- package/ui/embedding/index.android.js +2 -3
- package/ui/embedding/index.android.js.map +1 -1
- package/ui/frame/activity.android.js +44 -44
- package/ui/frame/activity.android.js.map +1 -1
- package/ui/frame/callbacks/activity-callbacks.js +118 -123
- package/ui/frame/callbacks/activity-callbacks.js.map +1 -1
- package/ui/frame/callbacks/fragment-callbacks.js +139 -141
- package/ui/frame/callbacks/fragment-callbacks.js.map +1 -1
- package/ui/frame/fragment.android.js +21 -21
- package/ui/frame/fragment.android.js.map +1 -1
- package/ui/frame/fragment.ios.js +1 -1
- package/ui/frame/fragment.transitions.android.js +105 -114
- package/ui/frame/fragment.transitions.android.js.map +1 -1
- package/ui/frame/frame-common.d.ts +1 -1
- package/ui/frame/frame-common.js +249 -285
- package/ui/frame/frame-common.js.map +1 -1
- package/ui/frame/frame-helpers.js +1 -1
- package/ui/frame/frame-helpers.js.map +1 -1
- package/ui/frame/frame-stack.js +4 -4
- package/ui/frame/frame-stack.js.map +1 -1
- package/ui/frame/index.android.js +239 -291
- package/ui/frame/index.android.js.map +1 -1
- package/ui/frame/index.ios.js +133 -167
- package/ui/frame/index.ios.js.map +1 -1
- package/ui/gestures/gestures-common.js +15 -29
- package/ui/gestures/gestures-common.js.map +1 -1
- package/ui/gestures/index.android.js +108 -124
- package/ui/gestures/index.android.js.map +1 -1
- package/ui/gestures/index.ios.js +108 -121
- package/ui/gestures/index.ios.js.map +1 -1
- package/ui/gestures/touch-manager.js +42 -48
- package/ui/gestures/touch-manager.js.map +1 -1
- package/ui/html-view/html-view-common.js +9 -14
- package/ui/html-view/html-view-common.js.map +1 -1
- package/ui/html-view/index.android.js +37 -43
- package/ui/html-view/index.android.js.map +1 -1
- package/ui/html-view/index.ios.js +62 -73
- package/ui/html-view/index.ios.js.map +1 -1
- package/ui/image/image-common.js +47 -57
- package/ui/image/image-common.js.map +1 -1
- package/ui/image/index.android.js +54 -59
- package/ui/image/index.android.js.map +1 -1
- package/ui/image/index.ios.js +65 -72
- package/ui/image/index.ios.js.map +1 -1
- package/ui/image/symbol-effects-common.js +2 -6
- package/ui/image/symbol-effects-common.js.map +1 -1
- package/ui/image/symbol-effects.android.js +4 -10
- package/ui/image/symbol-effects.android.js.map +1 -1
- package/ui/image/symbol-effects.ios.js +7 -11
- package/ui/image/symbol-effects.ios.js.map +1 -1
- package/ui/image-cache/image-cache-common.js +57 -61
- package/ui/image-cache/image-cache-common.js.map +1 -1
- package/ui/image-cache/index.android.js +23 -27
- package/ui/image-cache/index.android.js.map +1 -1
- package/ui/image-cache/index.ios.js +24 -29
- package/ui/image-cache/index.ios.js.map +1 -1
- package/ui/label/index.android.js +29 -38
- package/ui/label/index.android.js.map +1 -1
- package/ui/label/index.ios.js +89 -102
- package/ui/label/index.ios.js.map +1 -1
- package/ui/layouts/absolute-layout/absolute-layout-common.js +25 -30
- package/ui/layouts/absolute-layout/absolute-layout-common.js.map +1 -1
- package/ui/layouts/absolute-layout/index.android.js +6 -12
- package/ui/layouts/absolute-layout/index.android.js.map +1 -1
- package/ui/layouts/absolute-layout/index.ios.js +32 -40
- package/ui/layouts/absolute-layout/index.ios.js.map +1 -1
- package/ui/layouts/dock-layout/dock-layout-common.js +16 -21
- package/ui/layouts/dock-layout/dock-layout-common.js.map +1 -1
- package/ui/layouts/dock-layout/index.android.js +11 -17
- package/ui/layouts/dock-layout/index.android.js.map +1 -1
- package/ui/layouts/dock-layout/index.ios.js +45 -53
- package/ui/layouts/dock-layout/index.ios.js.map +1 -1
- package/ui/layouts/flexbox-layout/flexbox-layout-common.js +90 -115
- package/ui/layouts/flexbox-layout/flexbox-layout-common.js.map +1 -1
- package/ui/layouts/flexbox-layout/index.android.js +92 -97
- package/ui/layouts/flexbox-layout/index.android.js.map +1 -1
- package/ui/layouts/flexbox-layout/index.ios.js +366 -427
- package/ui/layouts/flexbox-layout/index.ios.js.map +1 -1
- package/ui/layouts/grid-layout/grid-layout-common.js +159 -211
- package/ui/layouts/grid-layout/grid-layout-common.js.map +1 -1
- package/ui/layouts/grid-layout/index.android.js +49 -55
- package/ui/layouts/grid-layout/index.android.js.map +1 -1
- package/ui/layouts/grid-layout/index.ios.js +340 -348
- package/ui/layouts/grid-layout/index.ios.js.map +1 -1
- package/ui/layouts/layout-base-common.js +78 -106
- package/ui/layouts/layout-base-common.js.map +1 -1
- package/ui/layouts/layout-base.android.js +25 -31
- package/ui/layouts/layout-base.android.js.map +1 -1
- package/ui/layouts/layout-base.ios.js +21 -27
- package/ui/layouts/layout-base.ios.js.map +1 -1
- package/ui/layouts/root-layout/index.android.js +47 -46
- package/ui/layouts/root-layout/index.android.js.map +1 -1
- package/ui/layouts/root-layout/index.ios.js +54 -53
- package/ui/layouts/root-layout/index.ios.js.map +1 -1
- package/ui/layouts/root-layout/root-layout-common.js +186 -190
- package/ui/layouts/root-layout/root-layout-common.js.map +1 -1
- package/ui/layouts/stack-layout/index.android.js +6 -12
- package/ui/layouts/stack-layout/index.android.js.map +1 -1
- package/ui/layouts/stack-layout/index.ios.js +62 -69
- package/ui/layouts/stack-layout/index.ios.js.map +1 -1
- package/ui/layouts/stack-layout/stack-layout-common.js +7 -12
- package/ui/layouts/stack-layout/stack-layout-common.js.map +1 -1
- package/ui/layouts/wrap-layout/index.android.js +10 -16
- package/ui/layouts/wrap-layout/index.android.js.map +1 -1
- package/ui/layouts/wrap-layout/index.ios.js +70 -76
- package/ui/layouts/wrap-layout/index.ios.js.map +1 -1
- package/ui/layouts/wrap-layout/wrap-layout-common.js +13 -18
- package/ui/layouts/wrap-layout/wrap-layout-common.js.map +1 -1
- package/ui/list-picker/index.android.js +42 -48
- package/ui/list-picker/index.android.js.map +1 -1
- package/ui/list-picker/index.ios.js +26 -36
- package/ui/list-picker/index.ios.js.map +1 -1
- package/ui/list-picker/list-picker-common.js +27 -32
- package/ui/list-picker/list-picker-common.js.map +1 -1
- package/ui/list-view/index.android.js +98 -110
- package/ui/list-view/index.android.js.map +1 -1
- package/ui/list-view/index.ios.js +121 -137
- package/ui/list-view/index.ios.js.map +1 -1
- package/ui/list-view/list-view-common.js +100 -116
- package/ui/list-view/list-view-common.js.map +1 -1
- package/ui/page/index.android.js +57 -65
- package/ui/page/index.android.js.map +1 -1
- package/ui/page/index.ios.js +98 -107
- package/ui/page/index.ios.js.map +1 -1
- package/ui/page/page-common.js +113 -145
- package/ui/page/page-common.js.map +1 -1
- package/ui/placeholder/index.android.js +10 -16
- package/ui/placeholder/index.android.js.map +1 -1
- package/ui/placeholder/index.js +6 -12
- package/ui/placeholder/index.js.map +1 -1
- package/ui/progress/index.android.js +28 -34
- package/ui/progress/index.android.js.map +1 -1
- package/ui/progress/index.ios.js +29 -39
- package/ui/progress/index.ios.js.map +1 -1
- package/ui/progress/progress-common.js +11 -16
- package/ui/progress/progress-common.js.map +1 -1
- package/ui/proxy-view-container/index.js +90 -111
- package/ui/proxy-view-container/index.js.map +1 -1
- package/ui/repeater/index.js +100 -112
- package/ui/repeater/index.js.map +1 -1
- package/ui/scroll-view/index.android.d.ts +1 -1
- package/ui/scroll-view/index.android.js +75 -95
- package/ui/scroll-view/index.android.js.map +1 -1
- package/ui/scroll-view/index.ios.js +72 -92
- package/ui/scroll-view/index.ios.js.map +1 -1
- package/ui/scroll-view/scroll-view-common.js +45 -65
- package/ui/scroll-view/scroll-view-common.js.map +1 -1
- package/ui/search-bar/index.android.js +88 -94
- package/ui/search-bar/index.android.js.map +1 -1
- package/ui/search-bar/index.ios.js +74 -88
- package/ui/search-bar/index.ios.js.map +1 -1
- package/ui/search-bar/search-bar-common.js +13 -18
- package/ui/search-bar/search-bar-common.js.map +1 -1
- package/ui/segmented-bar/index.android.js +98 -112
- package/ui/segmented-bar/index.android.js.map +1 -1
- package/ui/segmented-bar/index.ios.js +63 -80
- package/ui/segmented-bar/index.ios.js.map +1 -1
- package/ui/segmented-bar/segmented-bar-common.js +61 -81
- package/ui/segmented-bar/segmented-bar-common.js.map +1 -1
- package/ui/slider/index.android.js +43 -49
- package/ui/slider/index.android.js.map +1 -1
- package/ui/slider/index.ios.js +49 -59
- package/ui/slider/index.ios.js.map +1 -1
- package/ui/slider/slider-common.js +28 -35
- package/ui/slider/slider-common.js.map +1 -1
- package/ui/styling/background-common.js +98 -100
- package/ui/styling/background-common.js.map +1 -1
- package/ui/styling/background.android.js +35 -38
- package/ui/styling/background.android.js.map +1 -1
- package/ui/styling/background.ios.js +252 -258
- package/ui/styling/background.ios.js.map +1 -1
- package/ui/styling/box-shadow.js +2 -6
- package/ui/styling/box-shadow.js.map +1 -1
- package/ui/styling/converters.js +7 -7
- package/ui/styling/converters.js.map +1 -1
- package/ui/styling/css-animation-parser.js +56 -69
- package/ui/styling/css-animation-parser.js.map +1 -1
- package/ui/styling/css-selector.js +425 -522
- package/ui/styling/css-selector.js.map +1 -1
- package/ui/styling/css-shadow.js +2 -2
- package/ui/styling/css-shadow.js.map +1 -1
- package/ui/styling/css-stroke.js +3 -3
- package/ui/styling/css-stroke.js.map +1 -1
- package/ui/styling/css-utils.js +22 -22
- package/ui/styling/css-utils.js.map +1 -1
- package/ui/styling/font-common.js +44 -59
- package/ui/styling/font-common.js.map +1 -1
- package/ui/styling/font.android.js +34 -42
- package/ui/styling/font.android.js.map +1 -1
- package/ui/styling/font.ios.js +49 -54
- package/ui/styling/font.ios.js.map +1 -1
- package/ui/styling/linear-gradient.js +13 -17
- package/ui/styling/linear-gradient.js.map +1 -1
- package/ui/styling/style/index.js +36 -47
- package/ui/styling/style/index.js.map +1 -1
- package/ui/styling/style-properties.js +291 -306
- package/ui/styling/style-properties.js.map +1 -1
- package/ui/styling/style-scope.js +377 -416
- package/ui/styling/style-scope.js.map +1 -1
- package/ui/switch/index.android.js +41 -47
- package/ui/switch/index.android.js.map +1 -1
- package/ui/switch/index.ios.js +57 -66
- package/ui/switch/index.ios.js.map +1 -1
- package/ui/switch/switch-common.js +11 -16
- package/ui/switch/switch-common.js.map +1 -1
- package/ui/tab-view/index.android.js +187 -206
- package/ui/tab-view/index.android.js.map +1 -1
- package/ui/tab-view/index.ios.js +161 -177
- package/ui/tab-view/index.ios.js.map +1 -1
- package/ui/tab-view/tab-view-common.js +143 -197
- package/ui/tab-view/tab-view-common.js.map +1 -1
- package/ui/text-base/formatted-string.js +105 -158
- package/ui/text-base/formatted-string.js.map +1 -1
- package/ui/text-base/index.android.js +130 -136
- package/ui/text-base/index.android.js.map +1 -1
- package/ui/text-base/index.ios.js +112 -120
- package/ui/text-base/index.ios.js.map +1 -1
- package/ui/text-base/span.js +102 -158
- package/ui/text-base/span.js.map +1 -1
- package/ui/text-base/text-base-common.js +181 -268
- package/ui/text-base/text-base-common.js.map +1 -1
- package/ui/text-field/index.android.js +18 -24
- package/ui/text-field/index.android.js.map +1 -1
- package/ui/text-field/index.ios.js +70 -80
- package/ui/text-field/index.ios.js.map +1 -1
- package/ui/text-field/text-field-common.js +8 -13
- package/ui/text-field/text-field-common.js.map +1 -1
- package/ui/text-view/index.android.js +13 -19
- package/ui/text-view/index.android.js.map +1 -1
- package/ui/text-view/index.ios.js +116 -124
- package/ui/text-view/index.ios.js.map +1 -1
- package/ui/text-view/text-view-common.js +3 -9
- package/ui/text-view/text-view-common.js.map +1 -1
- package/ui/time-picker/index.android.js +18 -24
- package/ui/time-picker/index.android.js.map +1 -1
- package/ui/time-picker/index.ios.js +61 -69
- package/ui/time-picker/index.ios.js.map +1 -1
- package/ui/time-picker/time-picker-common.js +37 -42
- package/ui/time-picker/time-picker-common.js.map +1 -1
- package/ui/transition/fade-transition.android.js +8 -14
- package/ui/transition/fade-transition.android.js.map +1 -1
- package/ui/transition/fade-transition.ios.js +4 -10
- package/ui/transition/fade-transition.ios.js.map +1 -1
- package/ui/transition/flip-transition.android.js +14 -18
- package/ui/transition/flip-transition.android.js.map +1 -1
- package/ui/transition/index.android.js +24 -27
- package/ui/transition/index.android.js.map +1 -1
- package/ui/transition/index.ios.js +18 -22
- package/ui/transition/index.ios.js.map +1 -1
- package/ui/transition/modal-transition.android.js +4 -10
- package/ui/transition/modal-transition.android.js.map +1 -1
- package/ui/transition/modal-transition.ios.js +18 -25
- package/ui/transition/modal-transition.ios.js.map +1 -1
- package/ui/transition/page-transition.android.js +57 -71
- package/ui/transition/page-transition.android.js.map +1 -1
- package/ui/transition/page-transition.ios.js +19 -27
- package/ui/transition/page-transition.ios.js.map +1 -1
- package/ui/transition/shared-transition-helper.android.js +8 -12
- package/ui/transition/shared-transition-helper.android.js.map +1 -1
- package/ui/transition/shared-transition-helper.ios.js +442 -539
- package/ui/transition/shared-transition-helper.ios.js.map +1 -1
- package/ui/transition/shared-transition.js +77 -76
- package/ui/transition/shared-transition.js.map +1 -1
- package/ui/transition/slide-transition.android.js +17 -22
- package/ui/transition/slide-transition.android.js.map +1 -1
- package/ui/transition/slide-transition.ios.js +7 -11
- package/ui/transition/slide-transition.ios.js.map +1 -1
- package/ui/utils.ios.js +13 -13
- package/ui/utils.ios.js.map +1 -1
- package/ui/web-view/index.android.js +50 -64
- package/ui/web-view/index.android.js.map +1 -1
- package/ui/web-view/index.ios.js +50 -73
- package/ui/web-view/index.ios.js.map +1 -1
- package/ui/web-view/web-view-common.js +29 -43
- package/ui/web-view/web-view-common.js.map +1 -1
- package/utils/android/index.js +26 -27
- package/utils/android/index.js.map +1 -1
- package/utils/common.js +49 -65
- package/utils/common.js.map +1 -1
- package/utils/constants.android.js +1 -1
- package/utils/constants.android.js.map +1 -1
- package/utils/constants.ios.js +1 -1
- package/utils/constants.ios.js.map +1 -1
- package/utils/debug.js +32 -54
- package/utils/debug.js.map +1 -1
- package/utils/index.android.js +40 -36
- package/utils/index.android.js.map +1 -1
- package/utils/index.ios.js +9 -9
- package/utils/index.ios.js.map +1 -1
- package/utils/ios/index.js +45 -42
- package/utils/ios/index.js.map +1 -1
- package/utils/layout-helper/index.android.js +4 -4
- package/utils/layout-helper/index.android.js.map +1 -1
- package/utils/layout-helper/index.ios.js +2 -2
- package/utils/layout-helper/index.ios.js.map +1 -1
- package/utils/layout-helper/layout-helper-common.js +13 -13
- package/utils/layout-helper/layout-helper-common.js.map +1 -1
- package/utils/lazy.js +2 -2
- package/utils/lazy.js.map +1 -1
- package/utils/macrotask-scheduler.js +6 -6
- package/utils/macrotask-scheduler.js.map +1 -1
- package/utils/mainthread-helper.android.js +4 -4
- package/utils/mainthread-helper.android.js.map +1 -1
- package/utils/mainthread-helper.ios.js +1 -1
- package/utils/mainthread-helper.ios.js.map +1 -1
- package/utils/module-merge.js +1 -1
- package/utils/module-merge.js.map +1 -1
- package/utils/native-helper.android.js +19 -19
- package/utils/native-helper.android.js.map +1 -1
- package/utils/native-helper.ios.js +16 -23
- package/utils/native-helper.ios.js.map +1 -1
- package/utils/number-utils.js +3 -3
- package/utils/number-utils.js.map +1 -1
- package/utils/platform-check.js +6 -6
- package/utils/platform-check.js.map +1 -1
- package/utils/types.js +33 -43
- package/utils/types.js.map +1 -1
- package/wgc/crypto/SubtleCrypto.js +132 -167
- package/wgc/crypto/SubtleCrypto.js.map +1 -1
- package/wgc/crypto/index.d.ts +1 -1
- package/wgc/crypto/index.js +10 -18
- package/wgc/crypto/index.js.map +1 -1
- package/xhr/index.js +226 -308
- package/xhr/index.js.map +1 -1
- package/xml/index.js +78 -118
- package/xml/index.js.map +1 -1
|
@@ -2,65 +2,63 @@ import { GridLayoutBase, ItemSpec } from './grid-layout-common';
|
|
|
2
2
|
import { View } from '../../core/view';
|
|
3
3
|
import { layout } from '../../../utils';
|
|
4
4
|
export * from './grid-layout-common';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
}
|
|
15
|
-
GridLayout.prototype._onRowAdded = function (itemSpec) {
|
|
5
|
+
export class GridLayout extends GridLayoutBase {
|
|
6
|
+
constructor() {
|
|
7
|
+
super();
|
|
8
|
+
this.columnOffsets = new Array();
|
|
9
|
+
this.rowOffsets = new Array();
|
|
10
|
+
this.map = new Map();
|
|
11
|
+
this.helper = new MeasureHelper(this);
|
|
12
|
+
}
|
|
13
|
+
_onRowAdded(itemSpec) {
|
|
16
14
|
this.helper.rows.push(new ItemGroup(itemSpec));
|
|
17
|
-
}
|
|
18
|
-
|
|
15
|
+
}
|
|
16
|
+
_onColumnAdded(itemSpec) {
|
|
19
17
|
this.helper.columns.push(new ItemGroup(itemSpec));
|
|
20
|
-
}
|
|
21
|
-
|
|
18
|
+
}
|
|
19
|
+
_onRowRemoved(itemSpec, index) {
|
|
22
20
|
this.helper.rows[index].children.length = 0;
|
|
23
21
|
this.helper.rows.splice(index, 1);
|
|
24
|
-
}
|
|
25
|
-
|
|
22
|
+
}
|
|
23
|
+
_onColumnRemoved(itemSpec, index) {
|
|
26
24
|
this.helper.columns[index].children.length = 0;
|
|
27
25
|
this.helper.columns.splice(index, 1);
|
|
28
|
-
}
|
|
29
|
-
|
|
26
|
+
}
|
|
27
|
+
_registerLayoutChild(child) {
|
|
30
28
|
this.addToMap(child);
|
|
31
|
-
}
|
|
32
|
-
|
|
29
|
+
}
|
|
30
|
+
_unregisterLayoutChild(child) {
|
|
33
31
|
this.removeFromMap(child);
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
|
|
32
|
+
}
|
|
33
|
+
invalidate() {
|
|
34
|
+
super.invalidate();
|
|
37
35
|
this.requestLayout();
|
|
38
|
-
}
|
|
39
|
-
|
|
36
|
+
}
|
|
37
|
+
getColumnIndex(view) {
|
|
40
38
|
return Math.max(0, Math.min(GridLayout.getColumn(view), this.columnsInternal.length - 1));
|
|
41
|
-
}
|
|
42
|
-
|
|
39
|
+
}
|
|
40
|
+
getRowIndex(view) {
|
|
43
41
|
return Math.max(0, Math.min(GridLayout.getRow(view), this.rowsInternal.length - 1));
|
|
44
|
-
}
|
|
45
|
-
|
|
42
|
+
}
|
|
43
|
+
getColumnSpan(view, columnIndex) {
|
|
46
44
|
return Math.max(1, Math.min(GridLayout.getColumnSpan(view), this.columnsInternal.length - columnIndex));
|
|
47
|
-
}
|
|
48
|
-
|
|
45
|
+
}
|
|
46
|
+
getRowSpan(view, rowIndex) {
|
|
49
47
|
return Math.max(1, Math.min(GridLayout.getRowSpan(view), this.rowsInternal.length - rowIndex));
|
|
50
|
-
}
|
|
51
|
-
|
|
48
|
+
}
|
|
49
|
+
getColumnSpec(view) {
|
|
52
50
|
return this.columnsInternal[this.getColumnIndex(view)] || this.helper.singleColumn;
|
|
53
|
-
}
|
|
54
|
-
|
|
51
|
+
}
|
|
52
|
+
getRowSpec(view) {
|
|
55
53
|
return this.rowsInternal[this.getRowIndex(view)] || this.helper.singleRow;
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
54
|
+
}
|
|
55
|
+
updateMeasureSpecs(child, measureSpec) {
|
|
56
|
+
const column = this.getColumnSpec(child);
|
|
57
|
+
const columnIndex = this.getColumnIndex(child);
|
|
58
|
+
const columnSpan = this.getColumnSpan(child, columnIndex);
|
|
59
|
+
const row = this.getRowSpec(child);
|
|
60
|
+
const rowIndex = this.getRowIndex(child);
|
|
61
|
+
const rowSpan = this.getRowSpan(child, rowIndex);
|
|
64
62
|
measureSpec.setColumn(column);
|
|
65
63
|
measureSpec.setColumnIndex(columnIndex);
|
|
66
64
|
measureSpec.setColumnSpan(columnSpan);
|
|
@@ -74,26 +72,25 @@ var GridLayout = /** @class */ (function (_super) {
|
|
|
74
72
|
measureSpec.pixelWidth = 0;
|
|
75
73
|
measureSpec.starColumnsCount = 0;
|
|
76
74
|
measureSpec.starRowsCount = 0;
|
|
77
|
-
}
|
|
78
|
-
|
|
75
|
+
}
|
|
76
|
+
addToMap(child) {
|
|
79
77
|
this.map.set(child, new MeasureSpecs(child));
|
|
80
|
-
}
|
|
81
|
-
|
|
78
|
+
}
|
|
79
|
+
removeFromMap(child) {
|
|
82
80
|
this.map.delete(child);
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
var infinityHeight = heightMode === layout.UNSPECIFIED;
|
|
81
|
+
}
|
|
82
|
+
onMeasure(widthMeasureSpec, heightMeasureSpec) {
|
|
83
|
+
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
|
|
84
|
+
let measureWidth = 0;
|
|
85
|
+
let measureHeight = 0;
|
|
86
|
+
const width = layout.getMeasureSpecSize(widthMeasureSpec);
|
|
87
|
+
const widthMode = layout.getMeasureSpecMode(widthMeasureSpec);
|
|
88
|
+
const height = layout.getMeasureSpecSize(heightMeasureSpec);
|
|
89
|
+
const heightMode = layout.getMeasureSpecMode(heightMeasureSpec);
|
|
90
|
+
const horizontalPaddingsAndMargins = this.effectivePaddingLeft + this.effectivePaddingRight + this.effectiveBorderLeftWidth + this.effectiveBorderRightWidth;
|
|
91
|
+
const verticalPaddingsAndMargins = this.effectivePaddingTop + this.effectivePaddingBottom + this.effectiveBorderTopWidth + this.effectiveBorderBottomWidth;
|
|
92
|
+
const infinityWidth = widthMode === layout.UNSPECIFIED;
|
|
93
|
+
const infinityHeight = heightMode === layout.UNSPECIFIED;
|
|
97
94
|
this.helper.width = Math.max(0, width - horizontalPaddingsAndMargins);
|
|
98
95
|
this.helper.height = Math.max(0, height - verticalPaddingsAndMargins);
|
|
99
96
|
this.helper.stretchedHorizontally = widthMode === layout.EXACTLY || (this.horizontalAlignment === 'stretch' && !infinityWidth);
|
|
@@ -102,13 +99,13 @@ var GridLayout = /** @class */ (function (_super) {
|
|
|
102
99
|
this.helper.setInfinityHeight(infinityHeight);
|
|
103
100
|
this.helper.clearMeasureSpecs();
|
|
104
101
|
this.helper.init();
|
|
105
|
-
this.eachLayoutChild(
|
|
106
|
-
|
|
102
|
+
this.eachLayoutChild((child, last) => {
|
|
103
|
+
const measureSpecs = this.map.get(child);
|
|
107
104
|
if (!measureSpecs) {
|
|
108
105
|
return;
|
|
109
106
|
}
|
|
110
|
-
|
|
111
|
-
|
|
107
|
+
this.updateMeasureSpecs(child, measureSpecs);
|
|
108
|
+
this.helper.addMeasureSpec(measureSpecs);
|
|
112
109
|
});
|
|
113
110
|
this.helper.measure();
|
|
114
111
|
// Add in our padding
|
|
@@ -117,25 +114,25 @@ var GridLayout = /** @class */ (function (_super) {
|
|
|
117
114
|
// Check against our minimum sizes
|
|
118
115
|
measureWidth = Math.max(measureWidth, this.effectiveMinWidth);
|
|
119
116
|
measureHeight = Math.max(measureHeight, this.effectiveMinHeight);
|
|
120
|
-
|
|
121
|
-
|
|
117
|
+
const widthSizeAndState = View.resolveSizeAndState(measureWidth, width, widthMode, 0);
|
|
118
|
+
const heightSizeAndState = View.resolveSizeAndState(measureHeight, height, heightMode, 0);
|
|
122
119
|
this.setMeasuredDimension(widthSizeAndState, heightSizeAndState);
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
120
|
+
}
|
|
121
|
+
onLayout(left, top, right, bottom) {
|
|
122
|
+
super.onLayout(left, top, right, bottom);
|
|
123
|
+
const insets = this.getSafeAreaInsets();
|
|
124
|
+
const paddingLeft = this.effectiveBorderLeftWidth + this.effectivePaddingLeft + insets.left;
|
|
125
|
+
const paddingTop = this.effectiveBorderTopWidth + this.effectivePaddingTop + insets.top;
|
|
129
126
|
this.columnOffsets.length = 0;
|
|
130
127
|
this.rowOffsets.length = 0;
|
|
131
128
|
this.columnOffsets.push(paddingLeft);
|
|
132
129
|
this.rowOffsets.push(paddingTop);
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
for (
|
|
138
|
-
|
|
130
|
+
let offset = this.columnOffsets[0];
|
|
131
|
+
let roundedOffset = paddingLeft;
|
|
132
|
+
let roundedLength = 0;
|
|
133
|
+
let actualLength = 0;
|
|
134
|
+
for (let i = 0, size = this.helper.columns.length; i < size; i++) {
|
|
135
|
+
const columnGroup = this.helper.columns[i];
|
|
139
136
|
offset += columnGroup.length;
|
|
140
137
|
actualLength = offset - roundedOffset;
|
|
141
138
|
roundedLength = Math.round(actualLength);
|
|
@@ -147,8 +144,8 @@ var GridLayout = /** @class */ (function (_super) {
|
|
|
147
144
|
roundedOffset = paddingTop;
|
|
148
145
|
roundedLength = 0;
|
|
149
146
|
actualLength = 0;
|
|
150
|
-
for (
|
|
151
|
-
|
|
147
|
+
for (let i = 0, size = this.helper.rows.length; i < size; i++) {
|
|
148
|
+
const rowGroup = this.helper.rows[i];
|
|
152
149
|
offset += rowGroup.length;
|
|
153
150
|
actualLength = offset - roundedOffset;
|
|
154
151
|
roundedLength = Math.round(actualLength);
|
|
@@ -156,24 +153,22 @@ var GridLayout = /** @class */ (function (_super) {
|
|
|
156
153
|
roundedOffset += roundedLength;
|
|
157
154
|
this.rowOffsets.push(roundedOffset);
|
|
158
155
|
}
|
|
159
|
-
for (
|
|
160
|
-
|
|
161
|
-
for (
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
156
|
+
for (let i = 0, columns = this.helper.columns.length; i < columns; i++) {
|
|
157
|
+
const columnGroup = this.helper.columns[i];
|
|
158
|
+
for (let j = 0, children = columnGroup.children.length; j < children; j++) {
|
|
159
|
+
const measureSpec = columnGroup.children[j];
|
|
160
|
+
const childLeft = this.columnOffsets[measureSpec.getColumnIndex()];
|
|
161
|
+
const childRight = this.columnOffsets[measureSpec.getColumnIndex() + measureSpec.getColumnSpan()];
|
|
162
|
+
const childTop = this.rowOffsets[measureSpec.getRowIndex()];
|
|
163
|
+
const childBottom = this.rowOffsets[measureSpec.getRowIndex() + measureSpec.getRowSpan()];
|
|
167
164
|
// No need to include margins in the width, height
|
|
168
165
|
View.layoutChild(this, measureSpec.child, childLeft, childTop, childRight, childBottom);
|
|
169
166
|
}
|
|
170
167
|
}
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
var MeasureSpecs = /** @class */ (function () {
|
|
176
|
-
function MeasureSpecs(child) {
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
class MeasureSpecs {
|
|
171
|
+
constructor(child) {
|
|
177
172
|
this._columnSpan = 1;
|
|
178
173
|
this._rowSpan = 1;
|
|
179
174
|
this.pixelWidth = 0;
|
|
@@ -187,54 +182,53 @@ var MeasureSpecs = /** @class */ (function () {
|
|
|
187
182
|
this.rowIndex = 0;
|
|
188
183
|
this.child = child;
|
|
189
184
|
}
|
|
190
|
-
|
|
185
|
+
getSpanned() {
|
|
191
186
|
return this._columnSpan > 1 || this._rowSpan > 1;
|
|
192
|
-
}
|
|
193
|
-
|
|
187
|
+
}
|
|
188
|
+
getIsStar() {
|
|
194
189
|
return this.starRowsCount > 0 || this.starColumnsCount > 0;
|
|
195
|
-
}
|
|
196
|
-
|
|
190
|
+
}
|
|
191
|
+
getColumnSpan() {
|
|
197
192
|
return this._columnSpan;
|
|
198
|
-
}
|
|
199
|
-
|
|
193
|
+
}
|
|
194
|
+
getRowSpan() {
|
|
200
195
|
return this._rowSpan;
|
|
201
|
-
}
|
|
202
|
-
|
|
196
|
+
}
|
|
197
|
+
setRowSpan(value) {
|
|
203
198
|
// cannot have zero rowSpan.
|
|
204
199
|
this._rowSpan = Math.max(1, value);
|
|
205
|
-
}
|
|
206
|
-
|
|
200
|
+
}
|
|
201
|
+
setColumnSpan(value) {
|
|
207
202
|
// cannot have zero colSpan.
|
|
208
203
|
this._columnSpan = Math.max(1, value);
|
|
209
|
-
}
|
|
210
|
-
|
|
204
|
+
}
|
|
205
|
+
getRowIndex() {
|
|
211
206
|
return this.rowIndex;
|
|
212
|
-
}
|
|
213
|
-
|
|
207
|
+
}
|
|
208
|
+
getColumnIndex() {
|
|
214
209
|
return this.columnIndex;
|
|
215
|
-
}
|
|
216
|
-
|
|
210
|
+
}
|
|
211
|
+
setRowIndex(value) {
|
|
217
212
|
this.rowIndex = value;
|
|
218
|
-
}
|
|
219
|
-
|
|
213
|
+
}
|
|
214
|
+
setColumnIndex(value) {
|
|
220
215
|
this.columnIndex = value;
|
|
221
|
-
}
|
|
222
|
-
|
|
216
|
+
}
|
|
217
|
+
getRow() {
|
|
223
218
|
return this.row;
|
|
224
|
-
}
|
|
225
|
-
|
|
219
|
+
}
|
|
220
|
+
getColumn() {
|
|
226
221
|
return this.column;
|
|
227
|
-
}
|
|
228
|
-
|
|
222
|
+
}
|
|
223
|
+
setRow(value) {
|
|
229
224
|
this.row = value;
|
|
230
|
-
}
|
|
231
|
-
|
|
225
|
+
}
|
|
226
|
+
setColumn(value) {
|
|
232
227
|
this.column = value;
|
|
233
|
-
}
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
function ItemGroup(spec) {
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
class ItemGroup {
|
|
231
|
+
constructor(spec) {
|
|
238
232
|
this.length = 0;
|
|
239
233
|
this.measuredCount = 0;
|
|
240
234
|
this.children = new Array();
|
|
@@ -243,33 +237,32 @@ var ItemGroup = /** @class */ (function () {
|
|
|
243
237
|
this.infinityLength = false;
|
|
244
238
|
this.rowOrColumn = spec;
|
|
245
239
|
}
|
|
246
|
-
|
|
240
|
+
setIsLengthInfinity(infinityLength) {
|
|
247
241
|
this.infinityLength = infinityLength;
|
|
248
|
-
}
|
|
249
|
-
|
|
242
|
+
}
|
|
243
|
+
init(density) {
|
|
250
244
|
this.measuredCount = 0;
|
|
251
245
|
this.currentMeasureToFixCount = 0;
|
|
252
246
|
this.length = this.rowOrColumn.isAbsolute ? this.rowOrColumn.value * density : 0;
|
|
253
|
-
}
|
|
254
|
-
|
|
247
|
+
}
|
|
248
|
+
getAllMeasured() {
|
|
255
249
|
return this.measuredCount === this.children.length;
|
|
256
|
-
}
|
|
257
|
-
|
|
250
|
+
}
|
|
251
|
+
getCanBeFixed() {
|
|
258
252
|
return this.currentMeasureToFixCount === this.measureToFix;
|
|
259
|
-
}
|
|
260
|
-
|
|
253
|
+
}
|
|
254
|
+
getIsAuto() {
|
|
261
255
|
return this.rowOrColumn.isAuto || (this.rowOrColumn.isStar && this.infinityLength);
|
|
262
|
-
}
|
|
263
|
-
|
|
256
|
+
}
|
|
257
|
+
getIsStar() {
|
|
264
258
|
return this.rowOrColumn.isStar && !this.infinityLength;
|
|
265
|
-
}
|
|
266
|
-
|
|
259
|
+
}
|
|
260
|
+
getIsAbsolute() {
|
|
267
261
|
return this.rowOrColumn.isAbsolute;
|
|
268
|
-
}
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
function MeasureHelper(grid) {
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
class MeasureHelper {
|
|
265
|
+
constructor(grid) {
|
|
273
266
|
this.infinity = layout.makeMeasureSpec(0, layout.UNSPECIFIED);
|
|
274
267
|
this.rows = new Array();
|
|
275
268
|
this.columns = new Array();
|
|
@@ -293,25 +286,25 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
293
286
|
this.singleRowGroup = new ItemGroup(this.singleRow);
|
|
294
287
|
this.singleColumnGroup = new ItemGroup(this.singleColumn);
|
|
295
288
|
}
|
|
296
|
-
|
|
289
|
+
setInfinityWidth(value) {
|
|
297
290
|
this.infinityWidth = value;
|
|
298
|
-
for (
|
|
299
|
-
|
|
291
|
+
for (let i = 0, size = this.columns.length; i < size; i++) {
|
|
292
|
+
const columnGroup = this.columns[i];
|
|
300
293
|
columnGroup.setIsLengthInfinity(value);
|
|
301
294
|
}
|
|
302
|
-
}
|
|
303
|
-
|
|
295
|
+
}
|
|
296
|
+
setInfinityHeight(value) {
|
|
304
297
|
this.infinityHeight = value;
|
|
305
|
-
for (
|
|
306
|
-
|
|
298
|
+
for (let i = 0, size = this.rows.length; i < size; i++) {
|
|
299
|
+
const rowGroup = this.rows[i];
|
|
307
300
|
rowGroup.setIsLengthInfinity(value);
|
|
308
301
|
}
|
|
309
|
-
}
|
|
310
|
-
|
|
302
|
+
}
|
|
303
|
+
addMeasureSpec(measureSpec) {
|
|
311
304
|
// Get column stats
|
|
312
|
-
|
|
313
|
-
for (
|
|
314
|
-
|
|
305
|
+
let size = measureSpec.getColumnIndex() + measureSpec.getColumnSpan();
|
|
306
|
+
for (let i = measureSpec.getColumnIndex(); i < size; i++) {
|
|
307
|
+
const columnGroup = this.columns[i];
|
|
315
308
|
if (columnGroup.getIsAuto()) {
|
|
316
309
|
measureSpec.autoColumnsCount++;
|
|
317
310
|
}
|
|
@@ -324,8 +317,8 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
324
317
|
}
|
|
325
318
|
if (measureSpec.autoColumnsCount > 0 && measureSpec.starColumnsCount === 0) {
|
|
326
319
|
// Determine which auto columns are affected by this element
|
|
327
|
-
for (
|
|
328
|
-
|
|
320
|
+
for (let i = measureSpec.getColumnIndex(); i < size; i++) {
|
|
321
|
+
const columnGroup = this.columns[i];
|
|
329
322
|
if (columnGroup.getIsAuto()) {
|
|
330
323
|
columnGroup.measureToFix++;
|
|
331
324
|
}
|
|
@@ -333,8 +326,8 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
333
326
|
}
|
|
334
327
|
// Get row stats
|
|
335
328
|
size = measureSpec.getRowIndex() + measureSpec.getRowSpan();
|
|
336
|
-
for (
|
|
337
|
-
|
|
329
|
+
for (let i = measureSpec.getRowIndex(); i < size; i++) {
|
|
330
|
+
const rowGroup = this.rows[i];
|
|
338
331
|
if (rowGroup.getIsAuto()) {
|
|
339
332
|
measureSpec.autoRowsCount++;
|
|
340
333
|
}
|
|
@@ -347,8 +340,8 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
347
340
|
}
|
|
348
341
|
if (measureSpec.autoRowsCount > 0 && measureSpec.starRowsCount === 0) {
|
|
349
342
|
// Determine which auto rows are affected by this element
|
|
350
|
-
for (
|
|
351
|
-
|
|
343
|
+
for (let i = measureSpec.getRowIndex(); i < size; i++) {
|
|
344
|
+
const rowGroup = this.rows[i];
|
|
352
345
|
if (rowGroup.getIsAuto()) {
|
|
353
346
|
rowGroup.measureToFix++;
|
|
354
347
|
}
|
|
@@ -356,24 +349,24 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
356
349
|
}
|
|
357
350
|
this.columns[measureSpec.getColumnIndex()].children.push(measureSpec);
|
|
358
351
|
this.rows[measureSpec.getRowIndex()].children.push(measureSpec);
|
|
359
|
-
}
|
|
360
|
-
|
|
361
|
-
for (
|
|
352
|
+
}
|
|
353
|
+
clearMeasureSpecs() {
|
|
354
|
+
for (let i = 0, size = this.columns.length; i < size; i++) {
|
|
362
355
|
this.columns[i].children.length = 0;
|
|
363
356
|
}
|
|
364
|
-
for (
|
|
357
|
+
for (let i = 0, size = this.rows.length; i < size; i++) {
|
|
365
358
|
this.rows[i].children.length = 0;
|
|
366
359
|
}
|
|
367
|
-
}
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
for (
|
|
371
|
-
|
|
360
|
+
}
|
|
361
|
+
static initList(list) {
|
|
362
|
+
const density = layout.getDisplayDensity();
|
|
363
|
+
for (let i = 0, size = list.length; i < size; i++) {
|
|
364
|
+
const item = list[i];
|
|
372
365
|
item.init(density);
|
|
373
366
|
}
|
|
374
|
-
}
|
|
375
|
-
|
|
376
|
-
|
|
367
|
+
}
|
|
368
|
+
init() {
|
|
369
|
+
const rows = this.rows.length;
|
|
377
370
|
if (rows === 0) {
|
|
378
371
|
this.singleRowGroup.setIsLengthInfinity(this.infinityHeight);
|
|
379
372
|
this.rows.push(this.singleRowGroup);
|
|
@@ -383,7 +376,7 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
383
376
|
this.rows.splice(0, 1);
|
|
384
377
|
this.fakeRowAdded = false;
|
|
385
378
|
}
|
|
386
|
-
|
|
379
|
+
const cols = this.columns.length;
|
|
387
380
|
if (cols === 0) {
|
|
388
381
|
this.fakeColumnAdded = true;
|
|
389
382
|
this.singleColumnGroup.setIsLengthInfinity(this.infinityWidth);
|
|
@@ -399,38 +392,38 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
399
392
|
this.minRowStarValue = -1;
|
|
400
393
|
this.maxColumnStarValue = -1;
|
|
401
394
|
this.maxRowStarValue = -1;
|
|
402
|
-
}
|
|
403
|
-
|
|
395
|
+
}
|
|
396
|
+
itemMeasured(measureSpec, isFakeMeasure) {
|
|
404
397
|
if (!isFakeMeasure) {
|
|
405
398
|
this.columns[measureSpec.getColumnIndex()].measuredCount++;
|
|
406
399
|
this.rows[measureSpec.getRowIndex()].measuredCount++;
|
|
407
400
|
measureSpec.measured = true;
|
|
408
401
|
}
|
|
409
402
|
if (measureSpec.autoColumnsCount > 0 && measureSpec.starColumnsCount === 0) {
|
|
410
|
-
|
|
411
|
-
for (
|
|
412
|
-
|
|
403
|
+
const size = measureSpec.getColumnIndex() + measureSpec.getColumnSpan();
|
|
404
|
+
for (let i = measureSpec.getColumnIndex(); i < size; i++) {
|
|
405
|
+
const columnGroup = this.columns[i];
|
|
413
406
|
if (columnGroup.getIsAuto()) {
|
|
414
407
|
columnGroup.currentMeasureToFixCount++;
|
|
415
408
|
}
|
|
416
409
|
}
|
|
417
410
|
}
|
|
418
411
|
if (measureSpec.autoRowsCount > 0 && measureSpec.starRowsCount === 0) {
|
|
419
|
-
|
|
420
|
-
for (
|
|
421
|
-
|
|
412
|
+
const size = measureSpec.getRowIndex() + measureSpec.getRowSpan();
|
|
413
|
+
for (let i = measureSpec.getRowIndex(); i < size; i++) {
|
|
414
|
+
const rowGroup = this.rows[i];
|
|
422
415
|
if (rowGroup.getIsAuto()) {
|
|
423
416
|
rowGroup.currentMeasureToFixCount++;
|
|
424
417
|
}
|
|
425
418
|
}
|
|
426
419
|
}
|
|
427
|
-
}
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
for (
|
|
433
|
-
|
|
420
|
+
}
|
|
421
|
+
fixColumns() {
|
|
422
|
+
let currentColumnWidth = 0;
|
|
423
|
+
let columnStarCount = 0;
|
|
424
|
+
const columnCount = this.columns.length;
|
|
425
|
+
for (let i = 0; i < columnCount; i++) {
|
|
426
|
+
const item = this.columns[i];
|
|
434
427
|
if (item.rowOrColumn.isStar) {
|
|
435
428
|
columnStarCount += item.rowOrColumn.value;
|
|
436
429
|
}
|
|
@@ -439,16 +432,16 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
439
432
|
currentColumnWidth += item.length;
|
|
440
433
|
}
|
|
441
434
|
}
|
|
442
|
-
|
|
435
|
+
const widthForStarColumns = Math.max(0, this.width - currentColumnWidth);
|
|
443
436
|
this.maxColumnStarValue = columnStarCount > 0 ? widthForStarColumns / columnStarCount : 0;
|
|
444
437
|
MeasureHelper.updateStarLength(this.columns, this.maxColumnStarValue);
|
|
445
|
-
}
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
for (
|
|
451
|
-
|
|
438
|
+
}
|
|
439
|
+
fixRows() {
|
|
440
|
+
let currentRowHeight = 0;
|
|
441
|
+
let rowStarCount = 0;
|
|
442
|
+
const rowCount = this.rows.length;
|
|
443
|
+
for (let i = 0; i < rowCount; i++) {
|
|
444
|
+
const item = this.rows[i];
|
|
452
445
|
if (item.rowOrColumn.isStar) {
|
|
453
446
|
rowStarCount += item.rowOrColumn.value;
|
|
454
447
|
}
|
|
@@ -457,85 +450,85 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
457
450
|
currentRowHeight += item.length;
|
|
458
451
|
}
|
|
459
452
|
}
|
|
460
|
-
|
|
453
|
+
const heightForStarRows = Math.max(0, this.height - currentRowHeight);
|
|
461
454
|
this.maxRowStarValue = rowStarCount > 0 ? heightForStarRows / rowStarCount : 0;
|
|
462
455
|
MeasureHelper.updateStarLength(this.rows, this.maxRowStarValue);
|
|
463
|
-
}
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
for (
|
|
468
|
-
|
|
456
|
+
}
|
|
457
|
+
static updateStarLength(list, starValue) {
|
|
458
|
+
let offset = 0;
|
|
459
|
+
let roundedOffset = 0;
|
|
460
|
+
for (let i = 0, rowCount = list.length; i < rowCount; i++) {
|
|
461
|
+
const item = list[i];
|
|
469
462
|
if (item.getIsStar()) {
|
|
470
463
|
offset += item.rowOrColumn.value * starValue;
|
|
471
|
-
|
|
472
|
-
|
|
464
|
+
const actualLength = offset - roundedOffset;
|
|
465
|
+
const roundedLength = Math.round(actualLength);
|
|
473
466
|
item.length = roundedLength;
|
|
474
467
|
roundedOffset += roundedLength;
|
|
475
468
|
}
|
|
476
469
|
}
|
|
477
|
-
}
|
|
478
|
-
|
|
470
|
+
}
|
|
471
|
+
fakeMeasure() {
|
|
479
472
|
// Fake measure - measure all elements that have star rows and auto columns - with infinity Width and infinity Height
|
|
480
|
-
for (
|
|
481
|
-
|
|
473
|
+
for (let i = 0, size = this.columns.length; i < size; i++) {
|
|
474
|
+
const columnGroup = this.columns[i];
|
|
482
475
|
if (columnGroup.getAllMeasured()) {
|
|
483
476
|
continue;
|
|
484
477
|
}
|
|
485
|
-
for (
|
|
486
|
-
|
|
478
|
+
for (let j = 0, childrenCount = columnGroup.children.length; j < childrenCount; j++) {
|
|
479
|
+
const measureSpec = columnGroup.children[j];
|
|
487
480
|
if (measureSpec.starRowsCount > 0 && measureSpec.autoColumnsCount > 0 && measureSpec.starColumnsCount === 0) {
|
|
488
481
|
this.measureChild(measureSpec, true);
|
|
489
482
|
}
|
|
490
483
|
}
|
|
491
484
|
}
|
|
492
|
-
}
|
|
493
|
-
|
|
494
|
-
for (
|
|
495
|
-
|
|
496
|
-
for (
|
|
497
|
-
|
|
485
|
+
}
|
|
486
|
+
measureFixedColumnsNoStarRows() {
|
|
487
|
+
for (let i = 0, size = this.columns.length; i < size; i++) {
|
|
488
|
+
const columnGroup = this.columns[i];
|
|
489
|
+
for (let j = 0, childrenCount = columnGroup.children.length; j < childrenCount; j++) {
|
|
490
|
+
const measureSpec = columnGroup.children[j];
|
|
498
491
|
if (measureSpec.starColumnsCount > 0 && measureSpec.starRowsCount === 0) {
|
|
499
492
|
this.measureChildFixedColumns(measureSpec);
|
|
500
493
|
}
|
|
501
494
|
}
|
|
502
495
|
}
|
|
503
|
-
}
|
|
504
|
-
|
|
505
|
-
for (
|
|
506
|
-
|
|
507
|
-
for (
|
|
508
|
-
|
|
496
|
+
}
|
|
497
|
+
measureNoStarColumnsFixedRows() {
|
|
498
|
+
for (let i = 0, size = this.columns.length; i < size; i++) {
|
|
499
|
+
const columnGroup = this.columns[i];
|
|
500
|
+
for (let j = 0, childrenCount = columnGroup.children.length; j < childrenCount; j++) {
|
|
501
|
+
const measureSpec = columnGroup.children[j];
|
|
509
502
|
if (measureSpec.starRowsCount > 0 && measureSpec.starColumnsCount === 0) {
|
|
510
503
|
this.measureChildFixedRows(measureSpec);
|
|
511
504
|
}
|
|
512
505
|
}
|
|
513
506
|
}
|
|
514
|
-
}
|
|
515
|
-
|
|
516
|
-
for (
|
|
517
|
-
|
|
507
|
+
}
|
|
508
|
+
static canFix(list) {
|
|
509
|
+
for (let i = 0, size = list.length; i < size; i++) {
|
|
510
|
+
const item = list[i];
|
|
518
511
|
if (!item.getCanBeFixed()) {
|
|
519
512
|
return false;
|
|
520
513
|
}
|
|
521
514
|
}
|
|
522
515
|
return true;
|
|
523
|
-
}
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
for (
|
|
527
|
-
|
|
516
|
+
}
|
|
517
|
+
static getMeasureLength(list) {
|
|
518
|
+
let result = 0;
|
|
519
|
+
for (let i = 0, size = list.length; i < size; i++) {
|
|
520
|
+
const item = list[i];
|
|
528
521
|
result += item.length;
|
|
529
522
|
}
|
|
530
523
|
return result;
|
|
531
|
-
}
|
|
532
|
-
|
|
524
|
+
}
|
|
525
|
+
measure() {
|
|
533
526
|
// Measure auto & pixel columns and rows (no spans).
|
|
534
|
-
|
|
535
|
-
for (
|
|
536
|
-
|
|
537
|
-
for (
|
|
538
|
-
|
|
527
|
+
let size = this.columns.length;
|
|
528
|
+
for (let i = 0; i < size; i++) {
|
|
529
|
+
const columnGroup = this.columns[i];
|
|
530
|
+
for (let j = 0, childrenCount = columnGroup.children.length; j < childrenCount; j++) {
|
|
531
|
+
const measureSpec = columnGroup.children[j];
|
|
539
532
|
if (measureSpec.getIsStar() || measureSpec.getSpanned()) {
|
|
540
533
|
continue;
|
|
541
534
|
}
|
|
@@ -543,10 +536,10 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
543
536
|
}
|
|
544
537
|
}
|
|
545
538
|
// Measure auto & pixel columns and rows (with spans).
|
|
546
|
-
for (
|
|
547
|
-
|
|
548
|
-
for (
|
|
549
|
-
|
|
539
|
+
for (let i = 0; i < size; i++) {
|
|
540
|
+
const columnGroup = this.columns[i];
|
|
541
|
+
for (let j = 0, childrenCount = columnGroup.children.length; j < childrenCount; j++) {
|
|
542
|
+
const measureSpec = columnGroup.children[j];
|
|
550
543
|
if (measureSpec.getIsStar() || !measureSpec.getSpanned()) {
|
|
551
544
|
continue;
|
|
552
545
|
}
|
|
@@ -554,8 +547,8 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
554
547
|
}
|
|
555
548
|
}
|
|
556
549
|
// try fix stars!
|
|
557
|
-
|
|
558
|
-
|
|
550
|
+
const fixColumns = MeasureHelper.canFix(this.columns);
|
|
551
|
+
const fixRows = MeasureHelper.canFix(this.rows);
|
|
559
552
|
if (fixColumns) {
|
|
560
553
|
this.fixColumns();
|
|
561
554
|
}
|
|
@@ -585,10 +578,10 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
585
578
|
}
|
|
586
579
|
// Rows and columns are fixed here - measure remaining elements
|
|
587
580
|
size = this.columns.length;
|
|
588
|
-
for (
|
|
589
|
-
|
|
590
|
-
for (
|
|
591
|
-
|
|
581
|
+
for (let i = 0; i < size; i++) {
|
|
582
|
+
const columnGroup = this.columns[i];
|
|
583
|
+
for (let j = 0, childCount = columnGroup.children.length; j < childCount; j++) {
|
|
584
|
+
const measureSpec = columnGroup.children[j];
|
|
592
585
|
if (!measureSpec.measured) {
|
|
593
586
|
this.measureChildFixedColumnsAndRows(measureSpec);
|
|
594
587
|
}
|
|
@@ -606,25 +599,25 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
606
599
|
}
|
|
607
600
|
this.measuredWidth = MeasureHelper.getMeasureLength(this.columns);
|
|
608
601
|
this.measuredHeight = MeasureHelper.getMeasureLength(this.rows);
|
|
609
|
-
}
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
602
|
+
}
|
|
603
|
+
measureChild(measureSpec, isFakeMeasure) {
|
|
604
|
+
const widthMeasureSpec = measureSpec.autoColumnsCount > 0 ? this.infinity : layout.makeMeasureSpec(measureSpec.pixelWidth, layout.EXACTLY);
|
|
605
|
+
const heightMeasureSpec = isFakeMeasure || measureSpec.autoRowsCount > 0 ? this.infinity : layout.makeMeasureSpec(measureSpec.pixelHeight, layout.EXACTLY);
|
|
606
|
+
const childSize = View.measureChild(this.grid, measureSpec.child, widthMeasureSpec, heightMeasureSpec);
|
|
607
|
+
const childMeasuredWidth = childSize.measuredWidth;
|
|
608
|
+
const childMeasuredHeight = childSize.measuredHeight;
|
|
609
|
+
const columnSpanEnd = measureSpec.getColumnIndex() + measureSpec.getColumnSpan();
|
|
610
|
+
const rowSpanEnd = measureSpec.getRowIndex() + measureSpec.getRowSpan();
|
|
618
611
|
if (measureSpec.autoColumnsCount > 0) {
|
|
619
|
-
|
|
620
|
-
for (
|
|
621
|
-
|
|
612
|
+
let remainingSpace = childMeasuredWidth;
|
|
613
|
+
for (let i = measureSpec.getColumnIndex(); i < columnSpanEnd; i++) {
|
|
614
|
+
const columnGroup = this.columns[i];
|
|
622
615
|
remainingSpace -= columnGroup.length;
|
|
623
616
|
}
|
|
624
617
|
if (remainingSpace > 0) {
|
|
625
|
-
|
|
626
|
-
for (
|
|
627
|
-
|
|
618
|
+
const growSize = remainingSpace / measureSpec.autoColumnsCount;
|
|
619
|
+
for (let i = measureSpec.getColumnIndex(); i < columnSpanEnd; i++) {
|
|
620
|
+
const columnGroup = this.columns[i];
|
|
628
621
|
if (columnGroup.getIsAuto()) {
|
|
629
622
|
columnGroup.length += growSize;
|
|
630
623
|
}
|
|
@@ -632,15 +625,15 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
632
625
|
}
|
|
633
626
|
}
|
|
634
627
|
if (!isFakeMeasure && measureSpec.autoRowsCount > 0) {
|
|
635
|
-
|
|
636
|
-
for (
|
|
637
|
-
|
|
628
|
+
let remainingSpace = childMeasuredHeight;
|
|
629
|
+
for (let i = measureSpec.getRowIndex(); i < rowSpanEnd; i++) {
|
|
630
|
+
const rowGroup = this.rows[i];
|
|
638
631
|
remainingSpace -= rowGroup.length;
|
|
639
632
|
}
|
|
640
633
|
if (remainingSpace > 0) {
|
|
641
|
-
|
|
642
|
-
for (
|
|
643
|
-
|
|
634
|
+
const growSize = remainingSpace / measureSpec.autoRowsCount;
|
|
635
|
+
for (let i = measureSpec.getRowIndex(); i < rowSpanEnd; i++) {
|
|
636
|
+
const rowGroup = this.rows[i];
|
|
644
637
|
if (rowGroup.getIsAuto()) {
|
|
645
638
|
rowGroup.length += growSize;
|
|
646
639
|
}
|
|
@@ -648,35 +641,35 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
648
641
|
}
|
|
649
642
|
}
|
|
650
643
|
this.itemMeasured(measureSpec, isFakeMeasure);
|
|
651
|
-
}
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
for (
|
|
660
|
-
|
|
644
|
+
}
|
|
645
|
+
measureChildFixedColumns(measureSpec) {
|
|
646
|
+
const columnIndex = measureSpec.getColumnIndex();
|
|
647
|
+
const columnSpanEnd = columnIndex + measureSpec.getColumnSpan();
|
|
648
|
+
const rowIndex = measureSpec.getRowIndex();
|
|
649
|
+
const rowSpanEnd = rowIndex + measureSpec.getRowSpan();
|
|
650
|
+
let measureWidth = 0;
|
|
651
|
+
let growSize = 0;
|
|
652
|
+
for (let i = columnIndex; i < columnSpanEnd; i++) {
|
|
653
|
+
const columnGroup = this.columns[i];
|
|
661
654
|
measureWidth += columnGroup.length;
|
|
662
655
|
}
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
656
|
+
const widthMeasureSpec = layout.makeMeasureSpec(measureWidth, this.stretchedHorizontally ? layout.EXACTLY : layout.AT_MOST);
|
|
657
|
+
const heightMeasureSpec = measureSpec.autoRowsCount > 0 ? this.infinity : layout.makeMeasureSpec(measureSpec.pixelHeight, layout.EXACTLY);
|
|
658
|
+
const childSize = View.measureChild(this.grid, measureSpec.child, widthMeasureSpec, heightMeasureSpec);
|
|
659
|
+
const childMeasuredWidth = childSize.measuredWidth;
|
|
660
|
+
const childMeasuredHeight = childSize.measuredHeight;
|
|
668
661
|
this.updateMinColumnStarValueIfNeeded(measureSpec, childMeasuredWidth);
|
|
669
662
|
// Distribute height over auto rows
|
|
670
663
|
if (measureSpec.autoRowsCount > 0) {
|
|
671
|
-
|
|
672
|
-
for (
|
|
673
|
-
|
|
664
|
+
let remainingSpace = childMeasuredHeight;
|
|
665
|
+
for (let i = rowIndex; i < rowSpanEnd; i++) {
|
|
666
|
+
const rowGroup = this.rows[i];
|
|
674
667
|
remainingSpace -= rowGroup.length;
|
|
675
668
|
}
|
|
676
669
|
if (remainingSpace > 0) {
|
|
677
670
|
growSize = remainingSpace / measureSpec.autoRowsCount;
|
|
678
|
-
for (
|
|
679
|
-
|
|
671
|
+
for (let i = rowIndex; i < rowSpanEnd; i++) {
|
|
672
|
+
const rowGroup = this.rows[i];
|
|
680
673
|
if (rowGroup.getIsAuto()) {
|
|
681
674
|
rowGroup.length += growSize;
|
|
682
675
|
}
|
|
@@ -684,35 +677,35 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
684
677
|
}
|
|
685
678
|
}
|
|
686
679
|
this.itemMeasured(measureSpec, false);
|
|
687
|
-
}
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
for (
|
|
695
|
-
|
|
680
|
+
}
|
|
681
|
+
measureChildFixedRows(measureSpec) {
|
|
682
|
+
const columnIndex = measureSpec.getColumnIndex();
|
|
683
|
+
const columnSpanEnd = columnIndex + measureSpec.getColumnSpan();
|
|
684
|
+
const rowIndex = measureSpec.getRowIndex();
|
|
685
|
+
const rowSpanEnd = rowIndex + measureSpec.getRowSpan();
|
|
686
|
+
let measureHeight = 0;
|
|
687
|
+
for (let i = rowIndex; i < rowSpanEnd; i++) {
|
|
688
|
+
const rowGroup = this.rows[i];
|
|
696
689
|
measureHeight += rowGroup.length;
|
|
697
690
|
}
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
691
|
+
const widthMeasureSpec = measureSpec.autoColumnsCount > 0 ? this.infinity : layout.makeMeasureSpec(measureSpec.pixelWidth, layout.EXACTLY);
|
|
692
|
+
const heightMeasureSpec = layout.makeMeasureSpec(measureHeight, this.stretchedVertically ? layout.EXACTLY : layout.AT_MOST);
|
|
693
|
+
const childSize = View.measureChild(this.grid, measureSpec.child, widthMeasureSpec, heightMeasureSpec);
|
|
694
|
+
const childMeasuredWidth = childSize.measuredWidth;
|
|
695
|
+
const childMeasuredHeight = childSize.measuredHeight;
|
|
696
|
+
let remainingSpace = 0;
|
|
697
|
+
let growSize = 0;
|
|
705
698
|
// Distribute width over auto columns
|
|
706
699
|
if (measureSpec.autoColumnsCount > 0) {
|
|
707
700
|
remainingSpace = childMeasuredWidth;
|
|
708
|
-
for (
|
|
709
|
-
|
|
701
|
+
for (let i = columnIndex; i < columnSpanEnd; i++) {
|
|
702
|
+
const columnGroup = this.columns[i];
|
|
710
703
|
remainingSpace -= columnGroup.length;
|
|
711
704
|
}
|
|
712
705
|
if (remainingSpace > 0) {
|
|
713
706
|
growSize = remainingSpace / measureSpec.autoColumnsCount;
|
|
714
|
-
for (
|
|
715
|
-
|
|
707
|
+
for (let i = columnIndex; i < columnSpanEnd; i++) {
|
|
708
|
+
const columnGroup = this.columns[i];
|
|
716
709
|
if (columnGroup.getIsAuto()) {
|
|
717
710
|
columnGroup.length += growSize;
|
|
718
711
|
}
|
|
@@ -721,39 +714,39 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
721
714
|
}
|
|
722
715
|
this.updateMinRowStarValueIfNeeded(measureSpec, childMeasuredHeight);
|
|
723
716
|
this.itemMeasured(measureSpec, false);
|
|
724
|
-
}
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
for (
|
|
732
|
-
|
|
717
|
+
}
|
|
718
|
+
measureChildFixedColumnsAndRows(measureSpec) {
|
|
719
|
+
const columnIndex = measureSpec.getColumnIndex();
|
|
720
|
+
const columnSpanEnd = columnIndex + measureSpec.getColumnSpan();
|
|
721
|
+
const rowIndex = measureSpec.getRowIndex();
|
|
722
|
+
const rowSpanEnd = rowIndex + measureSpec.getRowSpan();
|
|
723
|
+
let measureWidth = 0;
|
|
724
|
+
for (let i = columnIndex; i < columnSpanEnd; i++) {
|
|
725
|
+
const columnGroup = this.columns[i];
|
|
733
726
|
measureWidth += columnGroup.length;
|
|
734
727
|
}
|
|
735
|
-
|
|
736
|
-
for (
|
|
737
|
-
|
|
728
|
+
let measureHeight = 0;
|
|
729
|
+
for (let i = rowIndex; i < rowSpanEnd; i++) {
|
|
730
|
+
const rowGroup = this.rows[i];
|
|
738
731
|
measureHeight += rowGroup.length;
|
|
739
732
|
}
|
|
740
733
|
// if (have stars) & (not stretch) - at most
|
|
741
|
-
|
|
742
|
-
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
|
|
734
|
+
const widthMeasureSpec = layout.makeMeasureSpec(measureWidth, measureSpec.starColumnsCount > 0 && !this.stretchedHorizontally ? layout.AT_MOST : layout.EXACTLY);
|
|
735
|
+
const heightMeasureSpec = layout.makeMeasureSpec(measureHeight, measureSpec.starRowsCount > 0 && !this.stretchedVertically ? layout.AT_MOST : layout.EXACTLY);
|
|
736
|
+
const childSize = View.measureChild(this.grid, measureSpec.child, widthMeasureSpec, heightMeasureSpec);
|
|
737
|
+
const childMeasuredWidth = childSize.measuredWidth;
|
|
738
|
+
const childMeasuredHeight = childSize.measuredHeight;
|
|
746
739
|
this.updateMinColumnStarValueIfNeeded(measureSpec, childMeasuredWidth);
|
|
747
740
|
this.updateMinRowStarValueIfNeeded(measureSpec, childMeasuredHeight);
|
|
748
741
|
this.itemMeasured(measureSpec, false);
|
|
749
|
-
}
|
|
750
|
-
|
|
742
|
+
}
|
|
743
|
+
updateMinRowStarValueIfNeeded(measureSpec, childMeasuredHeight) {
|
|
751
744
|
if (!this.stretchedVertically && measureSpec.starRowsCount > 0) {
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
|
|
755
|
-
for (
|
|
756
|
-
|
|
745
|
+
let remainingSpace = childMeasuredHeight;
|
|
746
|
+
const rowIndex = measureSpec.getRowIndex();
|
|
747
|
+
const rowSpanEnd = rowIndex + measureSpec.getRowSpan();
|
|
748
|
+
for (let i = rowIndex; i < rowSpanEnd; i++) {
|
|
749
|
+
const rowGroup = this.rows[i];
|
|
757
750
|
if (!rowGroup.getIsStar()) {
|
|
758
751
|
remainingSpace -= rowGroup.length;
|
|
759
752
|
}
|
|
@@ -762,16 +755,16 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
762
755
|
this.minRowStarValue = Math.max(remainingSpace / measureSpec.starRowsCount, this.minRowStarValue);
|
|
763
756
|
}
|
|
764
757
|
}
|
|
765
|
-
}
|
|
766
|
-
|
|
758
|
+
}
|
|
759
|
+
updateMinColumnStarValueIfNeeded(measureSpec, childMeasuredWidth) {
|
|
767
760
|
// When not stretched star columns are not fixed so we may grow them here
|
|
768
761
|
// if there is an element that spans on multiple columns
|
|
769
762
|
if (!this.stretchedHorizontally && measureSpec.starColumnsCount > 0) {
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
for (
|
|
774
|
-
|
|
763
|
+
let remainingSpace = childMeasuredWidth;
|
|
764
|
+
const columnIndex = measureSpec.getColumnIndex();
|
|
765
|
+
const columnSpanEnd = columnIndex + measureSpec.getColumnSpan();
|
|
766
|
+
for (let i = columnIndex; i < columnSpanEnd; i++) {
|
|
767
|
+
const columnGroup = this.columns[i];
|
|
775
768
|
if (!columnGroup.getIsStar()) {
|
|
776
769
|
remainingSpace -= columnGroup.length;
|
|
777
770
|
}
|
|
@@ -780,7 +773,6 @@ var MeasureHelper = /** @class */ (function () {
|
|
|
780
773
|
this.minColumnStarValue = Math.max(remainingSpace / measureSpec.starColumnsCount, this.minColumnStarValue);
|
|
781
774
|
}
|
|
782
775
|
}
|
|
783
|
-
}
|
|
784
|
-
|
|
785
|
-
}());
|
|
776
|
+
}
|
|
777
|
+
}
|
|
786
778
|
//# sourceMappingURL=index.ios.js.map
|