@nativescript/core 8.9.0-alpha.3 → 8.9.0-napi-es5.0
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 +23 -16
- package/abortcontroller/abortsignal.js.map +1 -1
- package/abortcontroller/index.js +20 -14
- 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 +23 -23
- package/accessibility/accessibility-properties.js.map +1 -1
- package/accessibility/accessibility-service-common.js +22 -12
- package/accessibility/accessibility-service-common.js.map +1 -1
- package/accessibility/accessibility-service.android.js +39 -27
- package/accessibility/accessibility-service.android.js.map +1 -1
- package/accessibility/accessibility-service.ios.js +17 -14
- 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 +8 -7
- package/accessibility/font-scale.android.js.map +1 -1
- package/accessibility/font-scale.ios.js +10 -9
- package/accessibility/font-scale.ios.js.map +1 -1
- package/accessibility/index.android.js +83 -77
- package/accessibility/index.android.js.map +1 -1
- package/accessibility/index.ios.js +36 -34
- 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 +214 -196
- 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 +149 -110
- package/application/application.android.js.map +1 -1
- package/application/application.ios.js +197 -162
- 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 +200 -157
- package/color/color-common.js.map +1 -1
- package/color/index.android.js +14 -4
- package/color/index.android.js.map +1 -1
- package/color/index.ios.js +24 -14
- 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 +24 -20
- package/console/index.js.map +1 -1
- package/core-types/index.d.ts +2 -2
- package/core-types/index.js +41 -41
- package/core-types/index.js.map +1 -1
- package/css/CSS3Parser.js +106 -104
- package/css/CSS3Parser.js.map +1 -1
- package/css/CSSNativeScript.js +34 -29
- package/css/CSSNativeScript.js.map +1 -1
- package/css/css-tree-parser.js.map +1 -1
- package/css/parser.js +179 -158
- 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 +29 -27
- package/css-mediaquery/index.js.map +1 -1
- package/data/observable/index.d.ts +1 -0
- package/data/observable/index.js +124 -114
- package/data/observable/index.js.map +1 -1
- package/data/observable-array/index.js +176 -119
- package/data/observable-array/index.js.map +1 -1
- package/data/virtual-array/index.js +74 -61
- package/data/virtual-array/index.js.map +1 -1
- package/debugger/InspectorBackendCommands.js +161 -137
- 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 +73 -61
- 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 +30 -25
- package/debugger/webinspector-css.js.map +1 -1
- package/debugger/webinspector-dom.js +43 -38
- package/debugger/webinspector-dom.js.map +1 -1
- package/debugger/webinspector-network.android.js +132 -103
- package/debugger/webinspector-network.android.js.map +1 -1
- package/debugger/webinspector-network.ios.js +128 -100
- package/debugger/webinspector-network.ios.js.map +1 -1
- package/file-system/file-system-access.android.js +421 -414
- package/file-system/file-system-access.android.js.map +1 -1
- package/file-system/file-system-access.ios.js +215 -205
- package/file-system/file-system-access.ios.js.map +1 -1
- package/file-system/index.js +372 -294
- package/file-system/index.js.map +1 -1
- package/fps-meter/fps-native.android.js +18 -15
- package/fps-meter/fps-native.android.js.map +1 -1
- package/fps-meter/fps-native.ios.js +11 -9
- 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 +117 -91
- 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 +54 -53
- package/http/http-request/index.android.js.map +1 -1
- package/http/http-request/index.ios.js +58 -56
- 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 +37 -25
- package/image-asset/image-asset-common.js.map +1 -1
- package/image-asset/index.android.js +25 -17
- package/image-asset/index.android.js.map +1 -1
- package/image-asset/index.ios.js +35 -25
- 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.d.ts +3 -2
- package/image-source/index.android.js +189 -156
- package/image-source/index.android.js.map +1 -1
- package/image-source/index.d.ts +5 -0
- package/image-source/index.ios.d.ts +3 -2
- package/image-source/index.ios.js +211 -178
- package/image-source/index.ios.js.map +1 -1
- package/index.d.ts +1 -1
- package/index.js +8 -4
- package/index.js.map +1 -1
- package/matrix/index.js +27 -17
- package/matrix/index.js.map +1 -1
- package/media-query-list/index.js +87 -61
- package/media-query-list/index.js.map +1 -1
- package/module-name-resolver/index.js +24 -21
- 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 +107 -68
- package/platform/device/index.android.js.map +1 -1
- package/platform/device/index.ios.js +101 -62
- package/platform/device/index.ios.js.map +1 -1
- package/platform/screen/index.android.js +63 -32
- package/platform/screen/index.android.js.map +1 -1
- package/platform/screen/index.ios.js +60 -29
- package/platform/screen/index.ios.js.map +1 -1
- package/platforms/android/widgets-release.aar +0 -0
- package/platforms/android/winter_tc-release.aar +0 -0
- package/platforms/ios/{NSCWinterCG.xcframework → NSCWinterTC.xcframework}/Info.plist +22 -22
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-simulator/NSCWinterCG.framework → NSCWinterTC.xcframework/ios-arm64/NSCWinterTC.framework}/Headers/NSCCrypto.h +1 -1
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64/NSCWinterTC.framework/Headers/NSCWinterTC.h +20 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64/NSCWinterCG.framework/Headers/NSString+WinterCG.h → NSCWinterTC.xcframework/ios-arm64/NSCWinterTC.framework/Headers/NSString+WinterTC.h} +3 -3
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64/NSCWinterCG.framework → NSCWinterTC.xcframework/ios-arm64/NSCWinterTC.framework}/Info.plist +0 -0
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64/NSCWinterTC.framework/Modules/module.modulemap +6 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64/NSCWinterCG.framework/NSCWinterCG → NSCWinterTC.xcframework/ios-arm64/NSCWinterTC.framework/NSCWinterTC} +0 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/NSCWinterCG.framework.dSYM → NSCWinterTC.xcframework/ios-arm64/dSYMs/NSCWinterTC.framework.dSYM}/Contents/Info.plist +1 -1
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/DWARF/NSCWinterTC +0 -0
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/Relocations/aarch64/NSCWinterTC.yml +40 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework/Versions/A → NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework}/Headers/NSCCrypto.h +1 -1
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework/Headers/NSCWinterTC.h +20 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework/Versions/A/Headers/NSString+WinterCG.h → NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework/Headers/NSString+WinterTC.h} +3 -3
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework/Modules/module.modulemap +6 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework/NSCWinterCG → NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework/NSCWinterTC} +0 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework/Versions/A → NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework}/Resources/Info.plist +10 -10
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64/NSCWinterCG.framework → NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework/Versions/A}/Headers/NSCCrypto.h +1 -1
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework/Versions/A/Headers/NSCWinterTC.h +20 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework/Headers/NSString+WinterCG.h → NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework/Versions/A/Headers/NSString+WinterTC.h} +3 -3
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework/Versions/A/Modules/module.modulemap +6 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework/Versions/A/NSCWinterCG → NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework/Versions/A/NSCWinterTC} +0 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework → NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework/Versions/A}/Resources/Info.plist +10 -10
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework/Versions/Current/NSCWinterCG → NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterTC.framework/Versions/Current/NSCWinterTC} +0 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-simulator/dSYMs/NSCWinterCG.framework.dSYM → NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/NSCWinterTC.framework.dSYM}/Contents/Info.plist +1 -1
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/DWARF/NSCWinterTC +0 -0
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/Relocations/aarch64/NSCWinterTC.yml +40 -0
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/Relocations/x86_64/NSCWinterTC.yml +40 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework → NSCWinterTC.xcframework/ios-arm64_x86_64-simulator/NSCWinterTC.framework}/Headers/NSCCrypto.h +1 -1
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64_x86_64-simulator/NSCWinterTC.framework/Headers/NSCWinterTC.h +20 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-simulator/NSCWinterCG.framework/Headers/NSString+WinterCG.h → NSCWinterTC.xcframework/ios-arm64_x86_64-simulator/NSCWinterTC.framework/Headers/NSString+WinterTC.h} +3 -3
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-simulator/NSCWinterCG.framework → NSCWinterTC.xcframework/ios-arm64_x86_64-simulator/NSCWinterTC.framework}/Info.plist +0 -0
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64_x86_64-simulator/NSCWinterTC.framework/Modules/module.modulemap +6 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-simulator/NSCWinterCG.framework/NSCWinterCG → NSCWinterTC.xcframework/ios-arm64_x86_64-simulator/NSCWinterTC.framework/NSCWinterTC} +0 -0
- package/platforms/ios/{NSCWinterCG.xcframework/xros-arm64_x86_64-simulator/NSCWinterCG.framework → NSCWinterTC.xcframework/ios-arm64_x86_64-simulator/NSCWinterTC.framework}/_CodeSignature/CodeResources +13 -13
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64/dSYMs/NSCWinterCG.framework.dSYM → NSCWinterTC.xcframework/ios-arm64_x86_64-simulator/dSYMs/NSCWinterTC.framework.dSYM}/Contents/Info.plist +1 -1
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64_x86_64-simulator/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/DWARF/NSCWinterTC +0 -0
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64_x86_64-simulator/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/Relocations/aarch64/NSCWinterTC.yml +40 -0
- package/platforms/ios/NSCWinterTC.xcframework/ios-arm64_x86_64-simulator/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/Relocations/x86_64/NSCWinterTC.yml +40 -0
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64/NSCWinterTC.framework/Headers/NSCCrypto.h +79 -0
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64/NSCWinterTC.framework/Headers/NSCWinterTC.h +20 -0
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64/NSCWinterTC.framework/Headers/NSString+WinterTC.h +21 -0
- package/platforms/ios/{NSCWinterCG.xcframework/xros-arm64/NSCWinterCG.framework → NSCWinterTC.xcframework/xros-arm64/NSCWinterTC.framework}/Info.plist +0 -0
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64/NSCWinterTC.framework/Modules/module.modulemap +6 -0
- package/platforms/ios/{NSCWinterCG.xcframework/xros-arm64/NSCWinterCG.framework/NSCWinterCG → NSCWinterTC.xcframework/xros-arm64/NSCWinterTC.framework/NSCWinterTC} +0 -0
- package/platforms/ios/{NSCWinterCG.xcframework/xros-arm64/dSYMs/NSCWinterCG.framework.dSYM → NSCWinterTC.xcframework/xros-arm64/dSYMs/NSCWinterTC.framework.dSYM}/Contents/Info.plist +1 -1
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/DWARF/NSCWinterTC +0 -0
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/Relocations/aarch64/NSCWinterTC.yml +40 -0
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64_x86_64-simulator/NSCWinterTC.framework/Headers/NSCCrypto.h +79 -0
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64_x86_64-simulator/NSCWinterTC.framework/Headers/NSCWinterTC.h +20 -0
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64_x86_64-simulator/NSCWinterTC.framework/Headers/NSString+WinterTC.h +21 -0
- package/platforms/ios/{NSCWinterCG.xcframework/xros-arm64_x86_64-simulator/NSCWinterCG.framework → NSCWinterTC.xcframework/xros-arm64_x86_64-simulator/NSCWinterTC.framework}/Info.plist +0 -0
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64_x86_64-simulator/NSCWinterTC.framework/Modules/module.modulemap +6 -0
- package/platforms/ios/{NSCWinterCG.xcframework/xros-arm64_x86_64-simulator/NSCWinterCG.framework/NSCWinterCG → NSCWinterTC.xcframework/xros-arm64_x86_64-simulator/NSCWinterTC.framework/NSCWinterTC} +0 -0
- package/platforms/ios/{NSCWinterCG.xcframework/ios-arm64_x86_64-simulator/NSCWinterCG.framework → NSCWinterTC.xcframework/xros-arm64_x86_64-simulator/NSCWinterTC.framework}/_CodeSignature/CodeResources +13 -13
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64_x86_64-simulator/dSYMs/NSCWinterTC.framework.dSYM/Contents/Info.plist +20 -0
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64_x86_64-simulator/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/DWARF/NSCWinterTC +0 -0
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64_x86_64-simulator/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/Relocations/aarch64/NSCWinterTC.yml +40 -0
- package/platforms/ios/NSCWinterTC.xcframework/xros-arm64_x86_64-simulator/dSYMs/NSCWinterTC.framework.dSYM/Contents/Resources/Relocations/x86_64/NSCWinterTC.yml +40 -0
- package/platforms/ios/src/NativeScriptMainWindow.swift +24 -7
- package/platforms/ios/src/UIView+NativeScript.m +2 -4
- package/profiling/index.js +47 -40
- package/profiling/index.js.map +1 -1
- package/text/text-common.js +49 -36
- package/text/text-common.js.map +1 -1
- package/timer/index.android.js +30 -20
- package/timer/index.android.js.map +1 -1
- package/timer/index.ios.js +22 -12
- package/timer/index.ios.js.map +1 -1
- package/trace/index.js +36 -26
- package/trace/index.js.map +1 -1
- package/ui/action-bar/action-bar-common.js +252 -193
- package/ui/action-bar/action-bar-common.js.map +1 -1
- package/ui/action-bar/index.android.d.ts +1 -0
- package/ui/action-bar/index.android.js +212 -167
- package/ui/action-bar/index.android.js.map +1 -1
- package/ui/action-bar/index.d.ts +33 -0
- package/ui/action-bar/index.ios.d.ts +7 -2
- package/ui/action-bar/index.ios.js +337 -193
- package/ui/action-bar/index.ios.js.map +1 -1
- package/ui/activity-indicator/activity-indicator-common.js +11 -6
- package/ui/activity-indicator/activity-indicator-common.js.map +1 -1
- package/ui/activity-indicator/index.android.js +26 -20
- package/ui/activity-indicator/index.android.js.map +1 -1
- package/ui/activity-indicator/index.d.ts +4 -0
- package/ui/activity-indicator/index.ios.js +31 -23
- package/ui/activity-indicator/index.ios.js.map +1 -1
- package/ui/animation/animation-common.d.ts +1 -8
- package/ui/animation/animation-common.js +50 -51
- package/ui/animation/animation-common.js.map +1 -1
- package/ui/animation/animation-interfaces.d.ts +11 -0
- package/ui/animation/animation-interfaces.js +14 -1
- package/ui/animation/animation-interfaces.js.map +1 -1
- package/ui/animation/index.android.d.ts +2 -2
- package/ui/animation/index.android.js +96 -92
- package/ui/animation/index.android.js.map +1 -1
- package/ui/animation/index.d.ts +0 -13
- package/ui/animation/index.ios.d.ts +2 -2
- package/ui/animation/index.ios.js +195 -229
- package/ui/animation/index.ios.js.map +1 -1
- package/ui/animation/keyframe-animation.js +89 -67
- 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 +59 -54
- package/ui/builder/index.js.map +1 -1
- package/ui/builder/xml2ui.js +158 -128
- package/ui/builder/xml2ui.js.map +1 -1
- package/ui/button/button-common.js +25 -18
- package/ui/button/button-common.js.map +1 -1
- package/ui/button/index.android.d.ts +1 -1
- package/ui/button/index.android.js +93 -80
- package/ui/button/index.android.js.map +1 -1
- package/ui/button/index.d.ts +6 -0
- package/ui/button/index.ios.js +118 -101
- package/ui/button/index.ios.js.map +1 -1
- package/ui/content-view/index.d.ts +9 -0
- package/ui/content-view/index.js +78 -60
- package/ui/content-view/index.js.map +1 -1
- package/ui/core/bindable/bindable-expressions.js +101 -93
- 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 +141 -136
- package/ui/core/bindable/index.js.map +1 -1
- package/ui/core/control-state-change/index.android.d.ts +2 -2
- package/ui/core/control-state-change/index.android.js +7 -5
- package/ui/core/control-state-change/index.android.js.map +1 -1
- package/ui/core/control-state-change/index.d.ts +4 -2
- package/ui/core/control-state-change/index.ios.d.ts +3 -7
- package/ui/core/control-state-change/index.ios.js +29 -42
- package/ui/core/control-state-change/index.ios.js.map +1 -1
- package/ui/core/properties/index.js +489 -440
- package/ui/core/properties/index.js.map +1 -1
- package/ui/core/view/index.android.d.ts +2 -7
- package/ui/core/view/index.android.js +387 -352
- package/ui/core/view/index.android.js.map +1 -1
- package/ui/core/view/index.d.ts +238 -14
- package/ui/core/view/index.ios.d.ts +3 -13
- package/ui/core/view/index.ios.js +411 -367
- package/ui/core/view/index.ios.js.map +1 -1
- package/ui/core/view/view-common.d.ts +11 -15
- package/ui/core/view/view-common.js +951 -654
- package/ui/core/view/view-common.js.map +1 -1
- package/ui/core/view/view-helper/index.android.js +19 -15
- package/ui/core/view/view-helper/index.android.js.map +1 -1
- package/ui/core/view/view-helper/index.d.ts +3 -3
- package/ui/core/view/view-helper/index.ios.d.ts +3 -18
- package/ui/core/view/view-helper/index.ios.js +85 -81
- package/ui/core/view/view-helper/index.ios.js.map +1 -1
- package/ui/core/view/view-helper/view-helper-common.js +49 -44
- package/ui/core/view/view-helper/view-helper-common.js.map +1 -1
- package/ui/core/view-base/index.d.ts +107 -4
- package/ui/core/view-base/index.js +452 -349
- package/ui/core/view-base/index.js.map +1 -1
- package/ui/core/weak-event-listener/index.js +26 -25
- package/ui/core/weak-event-listener/index.js.map +1 -1
- package/ui/date-picker/date-picker-common.d.ts +1 -0
- package/ui/date-picker/date-picker-common.js +35 -29
- package/ui/date-picker/date-picker-common.js.map +1 -1
- package/ui/date-picker/index.android.js +51 -43
- package/ui/date-picker/index.android.js.map +1 -1
- package/ui/date-picker/index.d.ts +30 -0
- package/ui/date-picker/index.ios.js +61 -51
- 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 +98 -86
- package/ui/dialogs/index.android.js.map +1 -1
- package/ui/dialogs/index.ios.js +80 -67
- package/ui/dialogs/index.ios.js.map +1 -1
- package/ui/editable-text-base/editable-text-base-common.d.ts +1 -2
- package/ui/editable-text-base/editable-text-base-common.js +44 -32
- package/ui/editable-text-base/editable-text-base-common.js.map +1 -1
- package/ui/editable-text-base/index.android.js +112 -106
- package/ui/editable-text-base/index.android.js.map +1 -1
- package/ui/editable-text-base/index.d.ts +42 -0
- package/ui/editable-text-base/index.ios.js +53 -47
- package/ui/editable-text-base/index.ios.js.map +1 -1
- package/ui/embedding/index.android.js +3 -2
- 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 +123 -118
- package/ui/frame/callbacks/activity-callbacks.js.map +1 -1
- package/ui/frame/callbacks/fragment-callbacks.js +141 -139
- 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 +114 -105
- package/ui/frame/fragment.transitions.android.js.map +1 -1
- package/ui/frame/frame-common.d.ts +4 -3
- package/ui/frame/frame-common.js +288 -252
- 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 +291 -239
- package/ui/frame/index.android.js.map +1 -1
- package/ui/frame/index.d.ts +40 -3
- package/ui/frame/index.ios.js +167 -133
- package/ui/frame/index.ios.js.map +1 -1
- package/ui/gestures/gestures-common.d.ts +22 -0
- package/ui/gestures/gestures-common.js +51 -15
- package/ui/gestures/gestures-common.js.map +1 -1
- package/ui/gestures/index.android.d.ts +1 -1
- package/ui/gestures/index.android.js +124 -109
- package/ui/gestures/index.android.js.map +1 -1
- package/ui/gestures/index.ios.d.ts +1 -1
- package/ui/gestures/index.ios.js +121 -108
- package/ui/gestures/index.ios.js.map +1 -1
- package/ui/gestures/touch-manager.d.ts +1 -1
- package/ui/gestures/touch-manager.js +48 -43
- package/ui/gestures/touch-manager.js.map +1 -1
- package/ui/html-view/html-view-common.d.ts +1 -0
- package/ui/html-view/html-view-common.js +14 -9
- package/ui/html-view/html-view-common.js.map +1 -1
- package/ui/html-view/index.android.js +43 -37
- package/ui/html-view/index.android.js.map +1 -1
- package/ui/html-view/index.d.ts +16 -2
- package/ui/html-view/index.ios.js +73 -62
- package/ui/html-view/index.ios.js.map +1 -1
- package/ui/image/image-common.d.ts +2 -0
- package/ui/image/image-common.js +59 -47
- package/ui/image/image-common.js.map +1 -1
- package/ui/image/index.android.js +59 -54
- package/ui/image/index.android.js.map +1 -1
- package/ui/image/index.d.ts +43 -1
- package/ui/image/index.ios.js +72 -65
- package/ui/image/index.ios.js.map +1 -1
- package/ui/image/symbol-effects-common.js +6 -2
- package/ui/image/symbol-effects-common.js.map +1 -1
- package/ui/image/symbol-effects.android.js +10 -4
- package/ui/image/symbol-effects.android.js.map +1 -1
- package/ui/image/symbol-effects.ios.js +11 -7
- package/ui/image/symbol-effects.ios.js.map +1 -1
- package/ui/image-cache/image-cache-common.js +61 -57
- package/ui/image-cache/image-cache-common.js.map +1 -1
- package/ui/image-cache/index.android.js +27 -23
- package/ui/image-cache/index.android.js.map +1 -1
- package/ui/image-cache/index.ios.js +29 -24
- package/ui/image-cache/index.ios.js.map +1 -1
- package/ui/index.d.ts +3 -1
- package/ui/index.js +1 -1
- package/ui/index.js.map +1 -1
- package/ui/label/index.android.js +38 -29
- package/ui/label/index.android.js.map +1 -1
- package/ui/label/index.d.ts +4 -0
- package/ui/label/index.ios.js +102 -89
- package/ui/label/index.ios.js.map +1 -1
- package/ui/layouts/absolute-layout/absolute-layout-common.js +30 -25
- package/ui/layouts/absolute-layout/absolute-layout-common.js.map +1 -1
- package/ui/layouts/absolute-layout/index.android.js +12 -6
- package/ui/layouts/absolute-layout/index.android.js.map +1 -1
- package/ui/layouts/absolute-layout/index.d.ts +2 -0
- package/ui/layouts/absolute-layout/index.ios.js +40 -32
- package/ui/layouts/absolute-layout/index.ios.js.map +1 -1
- package/ui/layouts/dock-layout/dock-layout-common.js +21 -16
- package/ui/layouts/dock-layout/dock-layout-common.js.map +1 -1
- package/ui/layouts/dock-layout/index.android.js +17 -11
- package/ui/layouts/dock-layout/index.android.js.map +1 -1
- package/ui/layouts/dock-layout/index.d.ts +5 -1
- package/ui/layouts/dock-layout/index.ios.js +53 -45
- package/ui/layouts/dock-layout/index.ios.js.map +1 -1
- package/ui/layouts/flexbox-layout/flexbox-layout-common.js +115 -90
- package/ui/layouts/flexbox-layout/flexbox-layout-common.js.map +1 -1
- package/ui/layouts/flexbox-layout/index.android.js +97 -92
- package/ui/layouts/flexbox-layout/index.android.js.map +1 -1
- package/ui/layouts/flexbox-layout/index.d.ts +32 -0
- package/ui/layouts/flexbox-layout/index.ios.js +427 -366
- package/ui/layouts/flexbox-layout/index.ios.js.map +1 -1
- package/ui/layouts/grid-layout/grid-layout-common.js +211 -159
- package/ui/layouts/grid-layout/grid-layout-common.js.map +1 -1
- package/ui/layouts/grid-layout/index.android.js +55 -49
- package/ui/layouts/grid-layout/index.android.js.map +1 -1
- package/ui/layouts/grid-layout/index.d.ts +19 -0
- package/ui/layouts/grid-layout/index.ios.js +348 -340
- package/ui/layouts/grid-layout/index.ios.js.map +1 -1
- package/ui/layouts/layout-base-common.d.ts +0 -1
- package/ui/layouts/layout-base-common.js +106 -85
- package/ui/layouts/layout-base-common.js.map +1 -1
- package/ui/layouts/layout-base.android.js +31 -25
- package/ui/layouts/layout-base.android.js.map +1 -1
- package/ui/layouts/layout-base.d.ts +14 -0
- package/ui/layouts/layout-base.ios.js +27 -21
- package/ui/layouts/layout-base.ios.js.map +1 -1
- package/ui/layouts/root-layout/index.android.js +46 -47
- package/ui/layouts/root-layout/index.android.js.map +1 -1
- package/ui/layouts/root-layout/index.d.ts +3 -0
- package/ui/layouts/root-layout/index.ios.js +53 -54
- package/ui/layouts/root-layout/index.ios.js.map +1 -1
- package/ui/layouts/root-layout/root-layout-common.js +190 -186
- package/ui/layouts/root-layout/root-layout-common.js.map +1 -1
- package/ui/layouts/stack-layout/index.android.js +12 -6
- package/ui/layouts/stack-layout/index.android.js.map +1 -1
- package/ui/layouts/stack-layout/index.d.ts +3 -0
- package/ui/layouts/stack-layout/index.ios.js +69 -62
- package/ui/layouts/stack-layout/index.ios.js.map +1 -1
- package/ui/layouts/stack-layout/stack-layout-common.js +12 -7
- package/ui/layouts/stack-layout/stack-layout-common.js.map +1 -1
- package/ui/layouts/wrap-layout/index.android.js +16 -10
- package/ui/layouts/wrap-layout/index.android.js.map +1 -1
- package/ui/layouts/wrap-layout/index.d.ts +8 -0
- package/ui/layouts/wrap-layout/index.ios.js +76 -70
- package/ui/layouts/wrap-layout/index.ios.js.map +1 -1
- package/ui/layouts/wrap-layout/wrap-layout-common.js +18 -13
- package/ui/layouts/wrap-layout/wrap-layout-common.js.map +1 -1
- package/ui/list-picker/index.android.js +48 -42
- package/ui/list-picker/index.android.js.map +1 -1
- package/ui/list-picker/index.d.ts +12 -1
- package/ui/list-picker/index.ios.js +36 -26
- package/ui/list-picker/index.ios.js.map +1 -1
- package/ui/list-picker/list-picker-common.d.ts +1 -0
- package/ui/list-picker/list-picker-common.js +32 -26
- package/ui/list-picker/list-picker-common.js.map +1 -1
- package/ui/list-view/index.android.js +110 -98
- package/ui/list-view/index.android.js.map +1 -1
- package/ui/list-view/index.d.ts +24 -0
- package/ui/list-view/index.ios.js +137 -121
- package/ui/list-view/index.ios.js.map +1 -1
- package/ui/list-view/list-view-common.js +116 -100
- package/ui/list-view/list-view-common.js.map +1 -1
- package/ui/page/index.android.js +65 -57
- package/ui/page/index.android.js.map +1 -1
- package/ui/page/index.d.ts +31 -2
- package/ui/page/index.ios.js +107 -98
- package/ui/page/index.ios.js.map +1 -1
- package/ui/page/page-common.js +145 -113
- package/ui/page/page-common.js.map +1 -1
- package/ui/placeholder/index.android.d.ts +1 -1
- package/ui/placeholder/index.android.js +16 -10
- package/ui/placeholder/index.android.js.map +1 -1
- package/ui/placeholder/index.d.ts +4 -0
- package/ui/placeholder/index.js +12 -6
- package/ui/placeholder/index.js.map +1 -1
- package/ui/progress/index.android.js +34 -28
- package/ui/progress/index.android.js.map +1 -1
- package/ui/progress/index.d.ts +13 -0
- package/ui/progress/index.ios.js +39 -29
- package/ui/progress/index.ios.js.map +1 -1
- package/ui/progress/progress-common.js +16 -11
- package/ui/progress/progress-common.js.map +1 -1
- package/ui/proxy-view-container/index.d.ts +2 -0
- package/ui/proxy-view-container/index.js +113 -90
- package/ui/proxy-view-container/index.js.map +1 -1
- package/ui/repeater/index.d.ts +2 -0
- package/ui/repeater/index.js +114 -100
- 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 +95 -75
- package/ui/scroll-view/index.android.js.map +1 -1
- package/ui/scroll-view/index.d.ts +10 -0
- package/ui/scroll-view/index.ios.js +92 -72
- package/ui/scroll-view/index.ios.js.map +1 -1
- package/ui/scroll-view/scroll-view-common.js +65 -45
- package/ui/scroll-view/scroll-view-common.js.map +1 -1
- package/ui/search-bar/index.android.js +94 -88
- package/ui/search-bar/index.android.js.map +1 -1
- package/ui/search-bar/index.d.ts +14 -0
- package/ui/search-bar/index.ios.js +88 -74
- package/ui/search-bar/index.ios.js.map +1 -1
- package/ui/search-bar/search-bar-common.js +18 -13
- package/ui/search-bar/search-bar-common.js.map +1 -1
- package/ui/segmented-bar/index.android.js +112 -98
- package/ui/segmented-bar/index.android.js.map +1 -1
- package/ui/segmented-bar/index.d.ts +21 -5
- package/ui/segmented-bar/index.ios.js +80 -63
- package/ui/segmented-bar/index.ios.js.map +1 -1
- package/ui/segmented-bar/segmented-bar-common.js +81 -61
- package/ui/segmented-bar/segmented-bar-common.js.map +1 -1
- package/ui/slider/index.android.js +49 -43
- package/ui/slider/index.android.js.map +1 -1
- package/ui/slider/index.d.ts +27 -0
- package/ui/slider/index.ios.js +59 -49
- package/ui/slider/index.ios.js.map +1 -1
- package/ui/slider/slider-common.d.ts +1 -0
- package/ui/slider/slider-common.js +35 -27
- package/ui/slider/slider-common.js.map +1 -1
- package/ui/styling/background-common.js +100 -98
- package/ui/styling/background-common.js.map +1 -1
- package/ui/styling/background.android.js +38 -35
- package/ui/styling/background.android.js.map +1 -1
- package/ui/styling/background.d.ts +2 -0
- package/ui/styling/background.ios.d.ts +1 -15
- package/ui/styling/background.ios.js +294 -290
- package/ui/styling/background.ios.js.map +1 -1
- package/ui/styling/box-shadow.js +6 -2
- 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 +69 -56
- package/ui/styling/css-animation-parser.js.map +1 -1
- package/ui/styling/css-selector.js +522 -425
- 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 +59 -44
- package/ui/styling/font-common.js.map +1 -1
- package/ui/styling/font.android.js +42 -34
- package/ui/styling/font.android.js.map +1 -1
- package/ui/styling/font.ios.js +54 -49
- package/ui/styling/font.ios.js.map +1 -1
- package/ui/styling/linear-gradient.js +17 -13
- package/ui/styling/linear-gradient.js.map +1 -1
- package/ui/styling/style/index.d.ts +3 -1
- package/ui/styling/style/index.js +46 -35
- package/ui/styling/style/index.js.map +1 -1
- package/ui/styling/style-properties.d.ts +1 -0
- package/ui/styling/style-properties.js +306 -291
- package/ui/styling/style-properties.js.map +1 -1
- package/ui/styling/style-scope.js +416 -377
- package/ui/styling/style-scope.js.map +1 -1
- package/ui/switch/index.android.js +47 -41
- package/ui/switch/index.android.js.map +1 -1
- package/ui/switch/index.d.ts +11 -0
- package/ui/switch/index.ios.js +66 -57
- package/ui/switch/index.ios.js.map +1 -1
- package/ui/switch/switch-common.js +20 -15
- package/ui/switch/switch-common.js.map +1 -1
- package/ui/tab-view/index.android.js +206 -187
- package/ui/tab-view/index.android.js.map +1 -1
- package/ui/tab-view/index.d.ts +43 -5
- package/ui/tab-view/index.ios.js +177 -161
- package/ui/tab-view/index.ios.js.map +1 -1
- package/ui/tab-view/tab-view-common.js +197 -143
- package/ui/tab-view/tab-view-common.js.map +1 -1
- package/ui/text-base/formatted-string.d.ts +24 -0
- package/ui/text-base/formatted-string.js +158 -105
- package/ui/text-base/formatted-string.js.map +1 -1
- package/ui/text-base/index.android.js +138 -141
- package/ui/text-base/index.android.js.map +1 -1
- package/ui/text-base/index.d.ts +47 -0
- package/ui/text-base/index.ios.js +120 -112
- package/ui/text-base/index.ios.js.map +1 -1
- package/ui/text-base/span.d.ts +30 -0
- package/ui/text-base/span.js +158 -102
- package/ui/text-base/span.js.map +1 -1
- package/ui/text-base/text-base-common.d.ts +2 -0
- package/ui/text-base/text-base-common.js +268 -175
- package/ui/text-base/text-base-common.js.map +1 -1
- package/ui/text-field/index.android.js +24 -18
- package/ui/text-field/index.android.js.map +1 -1
- package/ui/text-field/index.d.ts +13 -0
- package/ui/text-field/index.ios.js +80 -70
- package/ui/text-field/index.ios.js.map +1 -1
- package/ui/text-field/text-field-common.js +13 -8
- package/ui/text-field/text-field-common.js.map +1 -1
- package/ui/text-view/index.android.d.ts +0 -1
- package/ui/text-view/index.android.js +19 -14
- package/ui/text-view/index.android.js.map +1 -1
- package/ui/text-view/index.d.ts +11 -11
- package/ui/text-view/index.ios.d.ts +0 -3
- package/ui/text-view/index.ios.js +129 -177
- package/ui/text-view/index.ios.js.map +1 -1
- package/ui/text-view/text-view-common.d.ts +0 -26
- package/ui/text-view/text-view-common.js +9 -37
- package/ui/text-view/text-view-common.js.map +1 -1
- package/ui/time-picker/index.android.js +24 -18
- package/ui/time-picker/index.android.js.map +1 -1
- package/ui/time-picker/index.d.ts +27 -0
- package/ui/time-picker/index.ios.js +69 -61
- package/ui/time-picker/index.ios.js.map +1 -1
- package/ui/time-picker/time-picker-common.d.ts +1 -0
- package/ui/time-picker/time-picker-common.js +42 -36
- package/ui/time-picker/time-picker-common.js.map +1 -1
- package/ui/transition/fade-transition.android.js +14 -8
- package/ui/transition/fade-transition.android.js.map +1 -1
- package/ui/transition/fade-transition.ios.js +10 -4
- package/ui/transition/fade-transition.ios.js.map +1 -1
- package/ui/transition/flip-transition.android.js +18 -14
- package/ui/transition/flip-transition.android.js.map +1 -1
- package/ui/transition/index.android.js +27 -24
- package/ui/transition/index.android.js.map +1 -1
- package/ui/transition/index.ios.js +22 -18
- package/ui/transition/index.ios.js.map +1 -1
- package/ui/transition/modal-transition.android.js +10 -4
- package/ui/transition/modal-transition.android.js.map +1 -1
- package/ui/transition/modal-transition.ios.js +25 -18
- package/ui/transition/modal-transition.ios.js.map +1 -1
- package/ui/transition/page-transition.android.js +71 -57
- package/ui/transition/page-transition.android.js.map +1 -1
- package/ui/transition/page-transition.ios.js +27 -19
- package/ui/transition/page-transition.ios.js.map +1 -1
- package/ui/transition/shared-transition-helper.android.js +12 -8
- package/ui/transition/shared-transition-helper.android.js.map +1 -1
- package/ui/transition/shared-transition-helper.ios.js +539 -442
- package/ui/transition/shared-transition-helper.ios.js.map +1 -1
- package/ui/transition/shared-transition.js +76 -77
- package/ui/transition/shared-transition.js.map +1 -1
- package/ui/transition/slide-transition.android.js +22 -17
- package/ui/transition/slide-transition.android.js.map +1 -1
- package/ui/transition/slide-transition.ios.js +11 -7
- package/ui/transition/slide-transition.ios.js.map +1 -1
- package/ui/utils.d.ts +1 -1
- package/ui/utils.ios.d.ts +1 -2
- package/ui/utils.ios.js +13 -13
- package/ui/utils.ios.js.map +1 -1
- package/ui/web-view/index.android.js +64 -50
- package/ui/web-view/index.android.js.map +1 -1
- package/ui/web-view/index.d.ts +12 -0
- package/ui/web-view/index.ios.js +73 -50
- package/ui/web-view/index.ios.js.map +1 -1
- package/ui/web-view/web-view-common.d.ts +1 -1
- package/ui/web-view/web-view-common.js +43 -29
- package/ui/web-view/web-view-common.js.map +1 -1
- package/utils/android/index.js +27 -26
- package/utils/android/index.js.map +1 -1
- package/utils/common.js +65 -49
- 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 +54 -32
- package/utils/debug.js.map +1 -1
- package/utils/index.android.d.ts +1 -0
- package/utils/index.android.js +48 -36
- package/utils/index.android.js.map +1 -1
- package/utils/index.d.ts +6 -0
- package/utils/index.ios.d.ts +1 -0
- package/utils/index.ios.js +27 -7
- package/utils/index.ios.js.map +1 -1
- package/utils/ios/index.js +44 -47
- 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 +24 -16
- 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 +43 -33
- package/utils/types.js.map +1 -1
- package/wgc/atob.js +1 -1
- package/wgc/btoa.js +1 -1
- package/wgc/crypto/SubtleCrypto.js +168 -133
- package/wgc/crypto/SubtleCrypto.js.map +1 -1
- package/wgc/crypto/index.d.ts +1 -1
- package/wgc/crypto/index.js +21 -12
- package/wgc/crypto/index.js.map +1 -1
- package/xhr/index.js +308 -226
- package/xhr/index.js.map +1 -1
- package/xml/index.js +119 -79
- package/xml/index.js.map +1 -1
- package/platforms/android/winter_cg-release.aar +0 -0
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64/NSCWinterCG.framework/Headers/NSCWinterCG.h +0 -20
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64/NSCWinterCG.framework/Modules/module.modulemap +0 -6
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/DWARF/NSCWinterCG +0 -0
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/Relocations/aarch64/NSCWinterCG.yml +0 -40
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework/Headers/NSCWinterCG.h +0 -20
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework/Modules/module.modulemap +0 -6
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework/Versions/A/Headers/NSCWinterCG.h +0 -20
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/NSCWinterCG.framework/Versions/A/Modules/module.modulemap +0 -6
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/DWARF/NSCWinterCG +0 -0
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/Relocations/aarch64/NSCWinterCG.yml +0 -40
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/Relocations/x86_64/NSCWinterCG.yml +0 -40
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64_x86_64-simulator/NSCWinterCG.framework/Headers/NSCWinterCG.h +0 -20
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64_x86_64-simulator/NSCWinterCG.framework/Modules/module.modulemap +0 -6
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64_x86_64-simulator/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/DWARF/NSCWinterCG +0 -0
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64_x86_64-simulator/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/Relocations/aarch64/NSCWinterCG.yml +0 -40
- package/platforms/ios/NSCWinterCG.xcframework/ios-arm64_x86_64-simulator/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/Relocations/x86_64/NSCWinterCG.yml +0 -40
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64/NSCWinterCG.framework/Headers/NSCCrypto.h +0 -79
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64/NSCWinterCG.framework/Headers/NSCWinterCG.h +0 -20
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64/NSCWinterCG.framework/Headers/NSString+WinterCG.h +0 -21
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64/NSCWinterCG.framework/Modules/module.modulemap +0 -6
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/DWARF/NSCWinterCG +0 -0
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/Relocations/aarch64/NSCWinterCG.yml +0 -40
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64_x86_64-simulator/NSCWinterCG.framework/Headers/NSCCrypto.h +0 -79
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64_x86_64-simulator/NSCWinterCG.framework/Headers/NSCWinterCG.h +0 -20
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64_x86_64-simulator/NSCWinterCG.framework/Headers/NSString+WinterCG.h +0 -21
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64_x86_64-simulator/NSCWinterCG.framework/Modules/module.modulemap +0 -6
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64_x86_64-simulator/dSYMs/NSCWinterCG.framework.dSYM/Contents/Info.plist +0 -20
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64_x86_64-simulator/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/DWARF/NSCWinterCG +0 -0
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64_x86_64-simulator/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/Relocations/aarch64/NSCWinterCG.yml +0 -40
- package/platforms/ios/NSCWinterCG.xcframework/xros-arm64_x86_64-simulator/dSYMs/NSCWinterCG.framework.dSYM/Contents/Resources/Relocations/x86_64/NSCWinterCG.yml +0 -40
|
@@ -8,7 +8,7 @@ var UNSPECIFIED = layout.UNSPECIFIED;
|
|
|
8
8
|
var MEASURED_SIZE_MASK = layout.MEASURED_SIZE_MASK;
|
|
9
9
|
var MEASURED_STATE_TOO_SMALL = layout.MEASURED_STATE_TOO_SMALL;
|
|
10
10
|
function requestFlexboxLayout(value) {
|
|
11
|
-
|
|
11
|
+
var flexbox = this.parent;
|
|
12
12
|
if (flexbox instanceof FlexboxLayoutBase) {
|
|
13
13
|
flexbox.requestLayout();
|
|
14
14
|
}
|
|
@@ -18,34 +18,40 @@ View.prototype[flexGrowProperty.setNative] = requestFlexboxLayout;
|
|
|
18
18
|
View.prototype[flexShrinkProperty.setNative] = requestFlexboxLayout;
|
|
19
19
|
View.prototype[flexWrapBeforeProperty.setNative] = requestFlexboxLayout;
|
|
20
20
|
View.prototype[alignSelfProperty.setNative] = requestFlexboxLayout;
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
var MATCH_PARENT = -1;
|
|
22
|
+
var WRAP_CONTENT = -2;
|
|
23
|
+
var View_sUseZeroUnspecifiedMeasureSpec = true; // NOTE: android version < M
|
|
24
24
|
// Long ints may not be safe in JavaScript
|
|
25
|
-
|
|
25
|
+
var MAX_SIZE = 0x00ffffff & MEASURED_SIZE_MASK;
|
|
26
26
|
var makeMeasureSpec = layout.makeMeasureSpec;
|
|
27
27
|
var getMeasureSpecMode = layout.getMeasureSpecMode;
|
|
28
28
|
var getMeasureSpecSize = layout.getMeasureSpecSize;
|
|
29
29
|
// `eachLayoutChild` iterates over children, and we need more - indexed access.
|
|
30
30
|
// This class tries to accomodate that by collecting all children in an
|
|
31
31
|
// array no more than once per measure.
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
var MeasureContext = /** @class */ (function () {
|
|
33
|
+
function MeasureContext(owner) {
|
|
34
|
+
var _this = this;
|
|
34
35
|
this.owner = owner;
|
|
35
36
|
this.children = [];
|
|
36
|
-
this.owner.eachLayoutChild((child)
|
|
37
|
-
|
|
37
|
+
this.owner.eachLayoutChild(function (child) {
|
|
38
|
+
_this.children.push(child);
|
|
38
39
|
});
|
|
39
40
|
}
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
41
|
+
Object.defineProperty(MeasureContext.prototype, "childrenCount", {
|
|
42
|
+
get: function () {
|
|
43
|
+
return this.children.length;
|
|
44
|
+
},
|
|
45
|
+
enumerable: false,
|
|
46
|
+
configurable: true
|
|
47
|
+
});
|
|
48
|
+
MeasureContext.prototype.childAt = function (index) {
|
|
44
49
|
return this.children[index];
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
50
|
+
};
|
|
51
|
+
return MeasureContext;
|
|
52
|
+
}());
|
|
53
|
+
var FlexLine = /** @class */ (function () {
|
|
54
|
+
function FlexLine() {
|
|
49
55
|
this._left = Number.MAX_VALUE;
|
|
50
56
|
this._top = Number.MAX_VALUE;
|
|
51
57
|
this._right = Number.MAX_VALUE;
|
|
@@ -59,49 +65,91 @@ class FlexLine {
|
|
|
59
65
|
this._maxBaseline = 0;
|
|
60
66
|
this._indicesAlignSelfStretch = [];
|
|
61
67
|
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
68
|
+
Object.defineProperty(FlexLine.prototype, "left", {
|
|
69
|
+
get: function () {
|
|
70
|
+
return this._left;
|
|
71
|
+
},
|
|
72
|
+
enumerable: false,
|
|
73
|
+
configurable: true
|
|
74
|
+
});
|
|
75
|
+
Object.defineProperty(FlexLine.prototype, "top", {
|
|
76
|
+
get: function () {
|
|
77
|
+
return this._top;
|
|
78
|
+
},
|
|
79
|
+
enumerable: false,
|
|
80
|
+
configurable: true
|
|
81
|
+
});
|
|
82
|
+
Object.defineProperty(FlexLine.prototype, "right", {
|
|
83
|
+
get: function () {
|
|
84
|
+
return this._right;
|
|
85
|
+
},
|
|
86
|
+
enumerable: false,
|
|
87
|
+
configurable: true
|
|
88
|
+
});
|
|
89
|
+
Object.defineProperty(FlexLine.prototype, "bottom", {
|
|
90
|
+
get: function () {
|
|
91
|
+
return this._bottom;
|
|
92
|
+
},
|
|
93
|
+
enumerable: false,
|
|
94
|
+
configurable: true
|
|
95
|
+
});
|
|
96
|
+
Object.defineProperty(FlexLine.prototype, "mainSize", {
|
|
97
|
+
get: function () {
|
|
98
|
+
return this._mainSize;
|
|
99
|
+
},
|
|
100
|
+
enumerable: false,
|
|
101
|
+
configurable: true
|
|
102
|
+
});
|
|
103
|
+
Object.defineProperty(FlexLine.prototype, "crossSize", {
|
|
104
|
+
get: function () {
|
|
105
|
+
return this._crossSize;
|
|
106
|
+
},
|
|
107
|
+
enumerable: false,
|
|
108
|
+
configurable: true
|
|
109
|
+
});
|
|
110
|
+
Object.defineProperty(FlexLine.prototype, "itemCount", {
|
|
111
|
+
get: function () {
|
|
112
|
+
return this._itemCount;
|
|
113
|
+
},
|
|
114
|
+
enumerable: false,
|
|
115
|
+
configurable: true
|
|
116
|
+
});
|
|
117
|
+
Object.defineProperty(FlexLine.prototype, "totalFlexGrow", {
|
|
118
|
+
get: function () {
|
|
119
|
+
return this._totalFlexGrow;
|
|
120
|
+
},
|
|
121
|
+
enumerable: false,
|
|
122
|
+
configurable: true
|
|
123
|
+
});
|
|
124
|
+
Object.defineProperty(FlexLine.prototype, "totalFlexShrink", {
|
|
125
|
+
get: function () {
|
|
126
|
+
return this._totalFlexShrink;
|
|
127
|
+
},
|
|
128
|
+
enumerable: false,
|
|
129
|
+
configurable: true
|
|
130
|
+
});
|
|
131
|
+
return FlexLine;
|
|
132
|
+
}());
|
|
133
|
+
var Order = /** @class */ (function () {
|
|
134
|
+
function Order() {
|
|
79
135
|
}
|
|
80
|
-
|
|
81
|
-
return this._itemCount;
|
|
82
|
-
}
|
|
83
|
-
get totalFlexGrow() {
|
|
84
|
-
return this._totalFlexGrow;
|
|
85
|
-
}
|
|
86
|
-
get totalFlexShrink() {
|
|
87
|
-
return this._totalFlexShrink;
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
class Order {
|
|
91
|
-
compareTo(another) {
|
|
136
|
+
Order.prototype.compareTo = function (another) {
|
|
92
137
|
if (this.order !== another.order) {
|
|
93
138
|
return this.order - another.order;
|
|
94
139
|
}
|
|
95
140
|
return this.index - another.index;
|
|
96
|
-
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
141
|
+
};
|
|
142
|
+
return Order;
|
|
143
|
+
}());
|
|
144
|
+
var FlexboxLayout = /** @class */ (function (_super) {
|
|
145
|
+
__extends(FlexboxLayout, _super);
|
|
146
|
+
function FlexboxLayout() {
|
|
100
147
|
// Omit divider
|
|
101
|
-
|
|
102
|
-
|
|
148
|
+
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
149
|
+
_this._flexLines = [];
|
|
150
|
+
return _this;
|
|
103
151
|
}
|
|
104
|
-
onMeasure(widthMeasureSpec, heightMeasureSpec) {
|
|
152
|
+
FlexboxLayout.prototype.onMeasure = function (widthMeasureSpec, heightMeasureSpec) {
|
|
105
153
|
this.measureContext = new MeasureContext(this);
|
|
106
154
|
// Omit: super.onMeasure(widthMeasureSpec, heightMeasureSpec);
|
|
107
155
|
if (this._isOrderChangedFromLastMeasurement) {
|
|
@@ -123,110 +171,116 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
123
171
|
throw new Error('Invalid value for the flex direction is set: ' + this.flexDirection);
|
|
124
172
|
}
|
|
125
173
|
this._childrenFrozen.length = 0;
|
|
126
|
-
}
|
|
127
|
-
_getReorderedChildAt(index) {
|
|
128
|
-
|
|
174
|
+
};
|
|
175
|
+
FlexboxLayout.prototype._getReorderedChildAt = function (index) {
|
|
176
|
+
var child;
|
|
129
177
|
if (index < 0 || index >= this._reorderedIndices.length) {
|
|
130
178
|
child = null;
|
|
131
179
|
}
|
|
132
180
|
else {
|
|
133
|
-
|
|
181
|
+
var reorderedIndex = this._reorderedIndices[index];
|
|
134
182
|
child = this.measureContext.childAt(reorderedIndex);
|
|
135
183
|
}
|
|
136
184
|
return child;
|
|
137
|
-
}
|
|
138
|
-
_createReorderedIndices() {
|
|
139
|
-
|
|
140
|
-
|
|
185
|
+
};
|
|
186
|
+
FlexboxLayout.prototype._createReorderedIndices = function () {
|
|
187
|
+
var childCount = this.measureContext.childrenCount;
|
|
188
|
+
var orders = this._createOrders(childCount);
|
|
141
189
|
return this._sortOrdersIntoReorderedIndices(childCount, orders);
|
|
142
|
-
}
|
|
143
|
-
_sortOrdersIntoReorderedIndices(childCount, orders) {
|
|
144
|
-
|
|
190
|
+
};
|
|
191
|
+
FlexboxLayout.prototype._sortOrdersIntoReorderedIndices = function (childCount, orders) {
|
|
192
|
+
var _this = this;
|
|
193
|
+
orders.sort(function (a, b) { return a.compareTo(b); });
|
|
145
194
|
if (!this._orderCache) {
|
|
146
195
|
this._orderCache = [];
|
|
147
196
|
}
|
|
148
197
|
this._orderCache.length = 0;
|
|
149
|
-
|
|
150
|
-
orders.forEach((order, i)
|
|
198
|
+
var reorderedIndices = [];
|
|
199
|
+
orders.forEach(function (order, i) {
|
|
151
200
|
reorderedIndices[i] = order.index;
|
|
152
|
-
|
|
201
|
+
_this._orderCache[i] = order.order;
|
|
153
202
|
});
|
|
154
203
|
return reorderedIndices;
|
|
155
|
-
}
|
|
156
|
-
_createOrders(childCount) {
|
|
157
|
-
|
|
158
|
-
for (
|
|
159
|
-
|
|
160
|
-
|
|
204
|
+
};
|
|
205
|
+
FlexboxLayout.prototype._createOrders = function (childCount) {
|
|
206
|
+
var orders = [];
|
|
207
|
+
for (var i = 0; i < childCount; i++) {
|
|
208
|
+
var child = this.measureContext.childAt(i);
|
|
209
|
+
var order = new Order();
|
|
161
210
|
order.order = FlexboxLayout.getOrder(child);
|
|
162
211
|
order.index = i;
|
|
163
212
|
orders.push(order);
|
|
164
213
|
}
|
|
165
214
|
return orders;
|
|
166
|
-
}
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
this._orderCache
|
|
171
|
-
|
|
172
|
-
if (this._orderCache.length !== childCount) {
|
|
173
|
-
return true;
|
|
174
|
-
}
|
|
175
|
-
for (let i = 0; i < childCount; i++) {
|
|
176
|
-
const view = this.measureContext.childAt(i);
|
|
177
|
-
if (view === null) {
|
|
178
|
-
continue;
|
|
215
|
+
};
|
|
216
|
+
Object.defineProperty(FlexboxLayout.prototype, "_isOrderChangedFromLastMeasurement", {
|
|
217
|
+
get: function () {
|
|
218
|
+
var childCount = this.measureContext.childrenCount;
|
|
219
|
+
if (!this._orderCache) {
|
|
220
|
+
this._orderCache = [];
|
|
179
221
|
}
|
|
180
|
-
if (
|
|
222
|
+
if (this._orderCache.length !== childCount) {
|
|
181
223
|
return true;
|
|
182
224
|
}
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
225
|
+
for (var i = 0; i < childCount; i++) {
|
|
226
|
+
var view = this.measureContext.childAt(i);
|
|
227
|
+
if (view === null) {
|
|
228
|
+
continue;
|
|
229
|
+
}
|
|
230
|
+
if (FlexboxLayout.getOrder(view) !== this._orderCache[i]) {
|
|
231
|
+
return true;
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
return false;
|
|
235
|
+
},
|
|
236
|
+
enumerable: false,
|
|
237
|
+
configurable: true
|
|
238
|
+
});
|
|
239
|
+
FlexboxLayout.prototype._measureHorizontal = function (widthMeasureSpec, heightMeasureSpec) {
|
|
240
|
+
var _this = this;
|
|
241
|
+
var widthSize = getMeasureSpecSize(widthMeasureSpec);
|
|
242
|
+
var widthMode = getMeasureSpecMode(widthMeasureSpec);
|
|
243
|
+
var heightSize = getMeasureSpecSize(heightMeasureSpec);
|
|
244
|
+
var heightMode = getMeasureSpecMode(heightMeasureSpec);
|
|
245
|
+
var childState = 0;
|
|
192
246
|
this._flexLines.length = 0;
|
|
193
|
-
(()
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
247
|
+
(function () {
|
|
248
|
+
var childCount = _this.measureContext.childrenCount;
|
|
249
|
+
var paddingStart = FlexboxLayout.getPaddingStart(_this);
|
|
250
|
+
var paddingEnd = FlexboxLayout.getPaddingEnd(_this);
|
|
251
|
+
var largestHeightInRow = Number.MIN_VALUE;
|
|
252
|
+
var flexLine = new FlexLine();
|
|
253
|
+
var indexInFlexLine = 0;
|
|
200
254
|
flexLine._mainSize = paddingStart + paddingEnd;
|
|
201
|
-
for (
|
|
202
|
-
|
|
255
|
+
for (var i = 0; i < childCount; i++) {
|
|
256
|
+
var child = _this._getReorderedChildAt(i);
|
|
203
257
|
if (child === null) {
|
|
204
|
-
|
|
258
|
+
_this._addFlexLineIfLastFlexItem(i, childCount, flexLine);
|
|
205
259
|
continue;
|
|
206
260
|
}
|
|
207
261
|
else if (child.isCollapsed) {
|
|
208
262
|
flexLine._itemCount++;
|
|
209
|
-
|
|
263
|
+
_this._addFlexLineIfLastFlexItem(i, childCount, flexLine);
|
|
210
264
|
continue;
|
|
211
265
|
}
|
|
212
266
|
child._updateEffectiveLayoutValues(widthSize, widthMode, heightSize, heightMode);
|
|
213
|
-
|
|
267
|
+
var lp = child; // child.style;
|
|
214
268
|
if (FlexboxLayout.getAlignSelf(child) === 'stretch') {
|
|
215
269
|
flexLine._indicesAlignSelfStretch.push(i);
|
|
216
270
|
}
|
|
217
|
-
|
|
271
|
+
var childWidth = lp.effectiveWidth;
|
|
218
272
|
if (FlexBasisPercent.DEFAULT /*lp.flexBasisPercent*/ !== FlexBasisPercent.DEFAULT && widthMode === EXACTLY) {
|
|
219
273
|
childWidth = Math.round(widthSize * FlexBasisPercent.DEFAULT /*lp.flexBasisPercent*/);
|
|
220
274
|
}
|
|
221
|
-
|
|
222
|
-
|
|
275
|
+
var childWidthMeasureSpec = FlexboxLayout.getChildMeasureSpec(widthMeasureSpec, lp.effectivePaddingLeft + lp.effectivePaddingRight + lp.effectiveMarginLeft + lp.effectiveMarginRight, childWidth < 0 ? WRAP_CONTENT : childWidth);
|
|
276
|
+
var childHeightMeasureSpec = FlexboxLayout.getChildMeasureSpec(heightMeasureSpec, lp.effectivePaddingTop + lp.effectivePaddingBottom + lp.effectiveMarginTop + lp.effectiveMarginBottom, lp.effectiveHeight < 0 ? WRAP_CONTENT : lp.effectiveHeight);
|
|
223
277
|
child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
|
|
224
|
-
|
|
278
|
+
_this._checkSizeConstraints(child);
|
|
225
279
|
childState = View.combineMeasuredStates(childState, child.getMeasuredState());
|
|
226
280
|
largestHeightInRow = Math.max(largestHeightInRow, child.getMeasuredHeight() + lp.effectiveMarginTop + lp.effectiveMarginBottom);
|
|
227
|
-
if (
|
|
281
|
+
if (_this._isWrapRequired(child, widthMode, widthSize, flexLine._mainSize, child.getMeasuredWidth() + lp.effectiveMarginLeft + lp.effectiveMarginRight, i, indexInFlexLine)) {
|
|
228
282
|
if (flexLine.itemCount > 0) {
|
|
229
|
-
|
|
283
|
+
_this._addFlexLine(flexLine);
|
|
230
284
|
}
|
|
231
285
|
flexLine = new FlexLine();
|
|
232
286
|
flexLine._itemCount = 1;
|
|
@@ -243,58 +297,58 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
243
297
|
flexLine._totalFlexShrink += FlexboxLayout.getFlexShrink(child);
|
|
244
298
|
flexLine._crossSize = Math.max(flexLine._crossSize, largestHeightInRow);
|
|
245
299
|
// Omit divider
|
|
246
|
-
if (
|
|
300
|
+
if (_this.flexWrap !== FlexWrap.WRAP_REVERSE) {
|
|
247
301
|
flexLine._maxBaseline = Math.max(flexLine._maxBaseline, FlexboxLayout.getBaseline(child) + lp.effectiveMarginTop);
|
|
248
302
|
}
|
|
249
303
|
else {
|
|
250
304
|
flexLine._maxBaseline = Math.max(flexLine._maxBaseline, child.getMeasuredHeight() - FlexboxLayout.getBaseline(child) + lp.effectiveMarginBottom);
|
|
251
305
|
}
|
|
252
|
-
|
|
306
|
+
_this._addFlexLineIfLastFlexItem(i, childCount, flexLine);
|
|
253
307
|
}
|
|
254
308
|
})();
|
|
255
309
|
this._determineMainSize(this.flexDirection, widthMeasureSpec, heightMeasureSpec);
|
|
256
310
|
if (this.alignItems === AlignItems.BASELINE) {
|
|
257
|
-
|
|
258
|
-
this._flexLines.forEach((flexLine)
|
|
259
|
-
|
|
260
|
-
for (
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
if (
|
|
264
|
-
|
|
311
|
+
var viewIndex_1 = 0;
|
|
312
|
+
this._flexLines.forEach(function (flexLine) {
|
|
313
|
+
var largestHeightInLine = Number.MIN_VALUE;
|
|
314
|
+
for (var i = viewIndex_1; i < viewIndex_1 + flexLine._itemCount; i++) {
|
|
315
|
+
var child = _this._getReorderedChildAt(i);
|
|
316
|
+
var lp = child; // .style;
|
|
317
|
+
if (_this.flexWrap !== FlexWrap.WRAP_REVERSE) {
|
|
318
|
+
var marginTop = flexLine._maxBaseline - FlexboxLayout.getBaseline(child);
|
|
265
319
|
marginTop = Math.max(marginTop, lp.effectiveMarginTop);
|
|
266
320
|
largestHeightInLine = Math.max(largestHeightInLine, child.getActualSize().height + marginTop + lp.effectiveMarginBottom);
|
|
267
321
|
}
|
|
268
322
|
else {
|
|
269
|
-
|
|
323
|
+
var marginBottom = flexLine._maxBaseline - child.getMeasuredHeight() + FlexboxLayout.getBaseline(child);
|
|
270
324
|
marginBottom = Math.max(marginBottom, lp.effectiveMarginBottom);
|
|
271
325
|
largestHeightInLine = Math.max(largestHeightInLine, child.getActualSize().height + lp.effectiveMarginTop + marginBottom);
|
|
272
326
|
}
|
|
273
327
|
}
|
|
274
328
|
flexLine._crossSize = largestHeightInLine;
|
|
275
|
-
|
|
329
|
+
viewIndex_1 += flexLine.itemCount;
|
|
276
330
|
});
|
|
277
331
|
}
|
|
278
332
|
this._determineCrossSize(this.flexDirection, widthMeasureSpec, heightMeasureSpec, this.effectivePaddingTop + this.effectivePaddingBottom);
|
|
279
333
|
this._stretchViews(this.flexDirection, this.alignItems);
|
|
280
334
|
this._setMeasuredDimensionForFlex(this.flexDirection, widthMeasureSpec, heightMeasureSpec, childState);
|
|
281
|
-
}
|
|
282
|
-
_measureVertical(widthMeasureSpec, heightMeasureSpec) {
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
335
|
+
};
|
|
336
|
+
FlexboxLayout.prototype._measureVertical = function (widthMeasureSpec, heightMeasureSpec) {
|
|
337
|
+
var widthSize = getMeasureSpecSize(widthMeasureSpec);
|
|
338
|
+
var widthMode = getMeasureSpecMode(widthMeasureSpec);
|
|
339
|
+
var heightSize = getMeasureSpecSize(heightMeasureSpec);
|
|
340
|
+
var heightMode = getMeasureSpecMode(heightMeasureSpec);
|
|
341
|
+
var childState = 0;
|
|
288
342
|
this._flexLines.length = 0;
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
343
|
+
var childCount = this.measureContext.childrenCount;
|
|
344
|
+
var paddingTop = this.effectivePaddingTop;
|
|
345
|
+
var paddingBottom = this.effectivePaddingBottom;
|
|
346
|
+
var largestWidthInColumn = Number.MIN_VALUE;
|
|
347
|
+
var flexLine = new FlexLine();
|
|
294
348
|
flexLine._mainSize = paddingTop + paddingBottom;
|
|
295
|
-
|
|
296
|
-
for (
|
|
297
|
-
|
|
349
|
+
var indexInFlexLine = 0;
|
|
350
|
+
for (var i = 0; i < childCount; i++) {
|
|
351
|
+
var child = this._getReorderedChildAt(i);
|
|
298
352
|
if (child === null) {
|
|
299
353
|
this._addFlexLineIfLastFlexItem(i, childCount, flexLine);
|
|
300
354
|
continue;
|
|
@@ -305,17 +359,17 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
305
359
|
continue;
|
|
306
360
|
}
|
|
307
361
|
child._updateEffectiveLayoutValues(widthSize, widthMode, heightSize, heightMode);
|
|
308
|
-
|
|
362
|
+
var lp = child; // .style;
|
|
309
363
|
if (FlexboxLayout.getAlignSelf(child) === 'stretch') {
|
|
310
364
|
flexLine._indicesAlignSelfStretch.push(i);
|
|
311
365
|
}
|
|
312
|
-
|
|
366
|
+
var childHeight = lp.effectiveHeight;
|
|
313
367
|
// TODO: This should always be false
|
|
314
368
|
if (FlexBasisPercent.DEFAULT /* lp.flexBasisPercent */ !== FlexBasisPercent.DEFAULT && heightMode === EXACTLY) {
|
|
315
369
|
childHeight = Math.round(heightSize * FlexBasisPercent.DEFAULT /* lp.flexBasisPercent */);
|
|
316
370
|
}
|
|
317
|
-
|
|
318
|
-
|
|
371
|
+
var childWidthMeasureSpec = FlexboxLayout.getChildMeasureSpec(widthMeasureSpec, this.effectivePaddingLeft + this.effectivePaddingRight + lp.effectiveMarginLeft + lp.effectiveMarginRight, lp.effectiveWidth < 0 ? WRAP_CONTENT : lp.effectiveWidth);
|
|
372
|
+
var childHeightMeasureSpec = FlexboxLayout.getChildMeasureSpec(heightMeasureSpec, this.effectivePaddingTop + this.effectivePaddingBottom + lp.effectiveMarginTop + lp.effectiveMarginBottom, childHeight < 0 ? WRAP_CONTENT : childHeight);
|
|
319
373
|
child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
|
|
320
374
|
this._checkSizeConstraints(child);
|
|
321
375
|
childState = View.combineMeasuredStates(childState, child.getMeasuredState());
|
|
@@ -345,12 +399,12 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
345
399
|
this._determineCrossSize(this.flexDirection, widthMeasureSpec, heightMeasureSpec, this.effectivePaddingLeft + this.effectivePaddingRight);
|
|
346
400
|
this._stretchViews(this.flexDirection, this.alignItems);
|
|
347
401
|
this._setMeasuredDimensionForFlex(this.flexDirection, widthMeasureSpec, heightMeasureSpec, childState);
|
|
348
|
-
}
|
|
349
|
-
_checkSizeConstraints(view) {
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
402
|
+
};
|
|
403
|
+
FlexboxLayout.prototype._checkSizeConstraints = function (view) {
|
|
404
|
+
var needsMeasure = false;
|
|
405
|
+
var childWidth = view.getMeasuredWidth();
|
|
406
|
+
var childHeight = view.getMeasuredHeight();
|
|
407
|
+
var minWidth = view.effectiveMinWidth;
|
|
354
408
|
view.effectiveMinWidth = 0;
|
|
355
409
|
if (view.getMeasuredWidth() < minWidth) {
|
|
356
410
|
needsMeasure = true;
|
|
@@ -360,7 +414,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
360
414
|
needsMeasure = true;
|
|
361
415
|
childWidth = MAX_SIZE /*lp.maxWidth*/;
|
|
362
416
|
}
|
|
363
|
-
|
|
417
|
+
var minHeight = view.effectiveMinHeight;
|
|
364
418
|
view.effectiveMinHeight = 0;
|
|
365
419
|
if (childHeight < minHeight) {
|
|
366
420
|
needsMeasure = true;
|
|
@@ -375,24 +429,25 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
375
429
|
}
|
|
376
430
|
view.effectiveMinWidth = minWidth;
|
|
377
431
|
view.effectiveMinHeight = minHeight;
|
|
378
|
-
}
|
|
379
|
-
_addFlexLineIfLastFlexItem(childIndex, childCount, flexLine) {
|
|
432
|
+
};
|
|
433
|
+
FlexboxLayout.prototype._addFlexLineIfLastFlexItem = function (childIndex, childCount, flexLine) {
|
|
380
434
|
if (childIndex === childCount - 1 && flexLine.itemCount !== 0) {
|
|
381
435
|
this._addFlexLine(flexLine);
|
|
382
436
|
}
|
|
383
|
-
}
|
|
384
|
-
_addFlexLine(flexLine) {
|
|
437
|
+
};
|
|
438
|
+
FlexboxLayout.prototype._addFlexLine = function (flexLine) {
|
|
385
439
|
// Omit divider
|
|
386
440
|
this._flexLines.push(flexLine);
|
|
387
|
-
}
|
|
388
|
-
_determineMainSize(flexDirection, widthMeasureSpec, heightMeasureSpec) {
|
|
389
|
-
|
|
390
|
-
|
|
441
|
+
};
|
|
442
|
+
FlexboxLayout.prototype._determineMainSize = function (flexDirection, widthMeasureSpec, heightMeasureSpec) {
|
|
443
|
+
var _this = this;
|
|
444
|
+
var mainSize;
|
|
445
|
+
var paddingAlongMainAxis;
|
|
391
446
|
switch (flexDirection) {
|
|
392
447
|
case FlexDirection.ROW:
|
|
393
448
|
case FlexDirection.ROW_REVERSE: {
|
|
394
|
-
|
|
395
|
-
|
|
449
|
+
var widthMode = getMeasureSpecMode(widthMeasureSpec);
|
|
450
|
+
var widthSize = getMeasureSpecSize(widthMeasureSpec);
|
|
396
451
|
if (widthMode === EXACTLY) {
|
|
397
452
|
mainSize = widthSize;
|
|
398
453
|
}
|
|
@@ -404,8 +459,8 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
404
459
|
}
|
|
405
460
|
case FlexDirection.COLUMN:
|
|
406
461
|
case FlexDirection.COLUMN_REVERSE: {
|
|
407
|
-
|
|
408
|
-
|
|
462
|
+
var heightMode = getMeasureSpecMode(heightMeasureSpec);
|
|
463
|
+
var heightSize = getMeasureSpecSize(heightMeasureSpec);
|
|
409
464
|
if (heightMode === EXACTLY) {
|
|
410
465
|
mainSize = heightSize;
|
|
411
466
|
}
|
|
@@ -418,30 +473,30 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
418
473
|
default:
|
|
419
474
|
throw new Error('Invalid flex direction: ' + flexDirection);
|
|
420
475
|
}
|
|
421
|
-
|
|
422
|
-
this._flexLines.forEach((flexLine)
|
|
476
|
+
var childIndex = 0;
|
|
477
|
+
this._flexLines.forEach(function (flexLine) {
|
|
423
478
|
if (flexLine.mainSize < mainSize) {
|
|
424
|
-
childIndex =
|
|
479
|
+
childIndex = _this._expandFlexItems(flexLine, flexDirection, mainSize, paddingAlongMainAxis, childIndex);
|
|
425
480
|
}
|
|
426
481
|
else {
|
|
427
|
-
childIndex =
|
|
482
|
+
childIndex = _this._shrinkFlexItems(flexLine, flexDirection, mainSize, paddingAlongMainAxis, childIndex);
|
|
428
483
|
}
|
|
429
484
|
});
|
|
430
|
-
}
|
|
431
|
-
_expandFlexItems(flexLine, flexDirection, maxMainSize, paddingAlongMainAxis, startIndex) {
|
|
432
|
-
|
|
485
|
+
};
|
|
486
|
+
FlexboxLayout.prototype._expandFlexItems = function (flexLine, flexDirection, maxMainSize, paddingAlongMainAxis, startIndex) {
|
|
487
|
+
var childIndex = startIndex;
|
|
433
488
|
if (flexLine._totalFlexGrow <= 0 || maxMainSize < flexLine._mainSize) {
|
|
434
489
|
childIndex += flexLine._itemCount;
|
|
435
490
|
return childIndex;
|
|
436
491
|
}
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
492
|
+
var sizeBeforeExpand = flexLine._mainSize;
|
|
493
|
+
var needsReexpand = false;
|
|
494
|
+
var pendingSpace = maxMainSize - flexLine._mainSize;
|
|
495
|
+
var unitSpace = pendingSpace / flexLine._totalFlexGrow;
|
|
441
496
|
flexLine._mainSize = paddingAlongMainAxis + flexLine._dividerLengthInMainSize;
|
|
442
|
-
|
|
443
|
-
for (
|
|
444
|
-
|
|
497
|
+
var accumulatedRoundError = 0;
|
|
498
|
+
for (var i = 0; i < flexLine.itemCount; i++) {
|
|
499
|
+
var child = this._getReorderedChildAt(childIndex);
|
|
445
500
|
if (child === null) {
|
|
446
501
|
continue;
|
|
447
502
|
}
|
|
@@ -449,12 +504,12 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
449
504
|
childIndex++;
|
|
450
505
|
continue;
|
|
451
506
|
}
|
|
452
|
-
|
|
507
|
+
var lp = child; // .style;
|
|
453
508
|
if (this._isMainAxisDirectionHorizontal(flexDirection)) {
|
|
454
509
|
if (!this._childrenFrozen[childIndex]) {
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
510
|
+
var flexGrow = FlexboxLayout.getFlexGrow(child);
|
|
511
|
+
var rawCalculatedWidth = child.getMeasuredWidth() + unitSpace * flexGrow + accumulatedRoundError;
|
|
512
|
+
var roundedCalculatedWidth = Math.round(rawCalculatedWidth);
|
|
458
513
|
// TODO: MAX_SIZE is so big, this is always false:
|
|
459
514
|
if (roundedCalculatedWidth > MAX_SIZE /* lp.maxWidth */) {
|
|
460
515
|
needsReexpand = true;
|
|
@@ -471,9 +526,9 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
471
526
|
}
|
|
472
527
|
else {
|
|
473
528
|
if (!this._childrenFrozen[childIndex]) {
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
529
|
+
var flexGrow = FlexboxLayout.getFlexGrow(child);
|
|
530
|
+
var rawCalculatedHeight = child.getMeasuredHeight() + unitSpace * flexGrow + accumulatedRoundError;
|
|
531
|
+
var roundedCalculatedHeight = Math.round(rawCalculatedHeight);
|
|
477
532
|
// TODO: MAX_SIZE is so big this is always false:
|
|
478
533
|
if (roundedCalculatedHeight > MAX_SIZE /*lp.maxHeight*/) {
|
|
479
534
|
needsReexpand = true;
|
|
@@ -494,20 +549,20 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
494
549
|
this._expandFlexItems(flexLine, flexDirection, maxMainSize, paddingAlongMainAxis, startIndex);
|
|
495
550
|
}
|
|
496
551
|
return childIndex;
|
|
497
|
-
}
|
|
498
|
-
_shrinkFlexItems(flexLine, flexDirection, maxMainSize, paddingAlongMainAxis, startIndex) {
|
|
499
|
-
|
|
500
|
-
|
|
552
|
+
};
|
|
553
|
+
FlexboxLayout.prototype._shrinkFlexItems = function (flexLine, flexDirection, maxMainSize, paddingAlongMainAxis, startIndex) {
|
|
554
|
+
var childIndex = startIndex;
|
|
555
|
+
var sizeBeforeShrink = flexLine._mainSize;
|
|
501
556
|
if (flexLine._totalFlexShrink <= 0 || maxMainSize > flexLine._mainSize) {
|
|
502
557
|
childIndex += flexLine.itemCount;
|
|
503
558
|
return childIndex;
|
|
504
559
|
}
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
560
|
+
var needsReshrink = false;
|
|
561
|
+
var unitShrink = (flexLine._mainSize - maxMainSize) / flexLine._totalFlexShrink;
|
|
562
|
+
var accumulatedRoundError = 0;
|
|
508
563
|
flexLine._mainSize = paddingAlongMainAxis + flexLine._dividerLengthInMainSize;
|
|
509
|
-
for (
|
|
510
|
-
|
|
564
|
+
for (var i = 0; i < flexLine.itemCount; i++) {
|
|
565
|
+
var child = this._getReorderedChildAt(childIndex);
|
|
511
566
|
if (child === null) {
|
|
512
567
|
continue;
|
|
513
568
|
}
|
|
@@ -515,14 +570,14 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
515
570
|
childIndex++;
|
|
516
571
|
continue;
|
|
517
572
|
}
|
|
518
|
-
|
|
573
|
+
var lp = child; // .style;
|
|
519
574
|
if (this._isMainAxisDirectionHorizontal(flexDirection)) {
|
|
520
575
|
// The direction of main axis is horizontal
|
|
521
576
|
if (!this._childrenFrozen[childIndex]) {
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
577
|
+
var flexShrink = FlexboxLayout.getFlexShrink(child);
|
|
578
|
+
var rawCalculatedWidth = child.getMeasuredWidth() - unitShrink * flexShrink + accumulatedRoundError;
|
|
579
|
+
var roundedCalculatedWidth = Math.round(rawCalculatedWidth);
|
|
580
|
+
var minWidth = child.effectiveMinWidth;
|
|
526
581
|
child.effectiveMinWidth = 0;
|
|
527
582
|
if (roundedCalculatedWidth < minWidth) {
|
|
528
583
|
needsReshrink = true;
|
|
@@ -533,12 +588,12 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
533
588
|
else {
|
|
534
589
|
accumulatedRoundError = rawCalculatedWidth - roundedCalculatedWidth;
|
|
535
590
|
}
|
|
536
|
-
|
|
591
|
+
var childWidthMeasureSpec = makeMeasureSpec(roundedCalculatedWidth, EXACTLY);
|
|
537
592
|
// NOTE: for controls that support internal content wrapping (e.g. UILabel) reducing the width
|
|
538
593
|
// might result in increased height e.g. text that could be shown on one line for larger
|
|
539
594
|
// width needs to be wrapped in two when width is reduced.
|
|
540
595
|
// As a result we cannot unconditionally measure with EXACTLY the current measured height
|
|
541
|
-
|
|
596
|
+
var childHeightMeasureSpec = FlexboxLayout.getChildMeasureSpec(this._currentHeightMeasureSpec, lp.effectivePaddingTop + lp.effectivePaddingBottom + lp.effectiveMarginTop + lp.effectiveMarginBottom, lp.effectiveHeight < 0 ? WRAP_CONTENT : lp.effectiveHeight);
|
|
542
597
|
child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
|
|
543
598
|
child.effectiveMinWidth = minWidth;
|
|
544
599
|
// make sure crossSize is up-to-date as child calculated height might have increased
|
|
@@ -548,10 +603,10 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
548
603
|
}
|
|
549
604
|
else {
|
|
550
605
|
if (!this._childrenFrozen[childIndex]) {
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
606
|
+
var flexShrink = FlexboxLayout.getFlexShrink(child);
|
|
607
|
+
var rawCalculatedHeight = child.getMeasuredHeight() - unitShrink * flexShrink + accumulatedRoundError;
|
|
608
|
+
var roundedCalculatedHeight = Math.round(rawCalculatedHeight);
|
|
609
|
+
var minHeight = child.effectiveMinHeight;
|
|
555
610
|
child.effectiveMinHeight = 0;
|
|
556
611
|
if (roundedCalculatedHeight < minHeight) {
|
|
557
612
|
needsReshrink = true;
|
|
@@ -573,10 +628,11 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
573
628
|
this._shrinkFlexItems(flexLine, flexDirection, maxMainSize, paddingAlongMainAxis, startIndex);
|
|
574
629
|
}
|
|
575
630
|
return childIndex;
|
|
576
|
-
}
|
|
577
|
-
_determineCrossSize(flexDirection, widthMeasureSpec, heightMeasureSpec, paddingAlongCrossAxis) {
|
|
578
|
-
|
|
579
|
-
|
|
631
|
+
};
|
|
632
|
+
FlexboxLayout.prototype._determineCrossSize = function (flexDirection, widthMeasureSpec, heightMeasureSpec, paddingAlongCrossAxis) {
|
|
633
|
+
var _this = this;
|
|
634
|
+
var mode;
|
|
635
|
+
var size;
|
|
580
636
|
switch (flexDirection) {
|
|
581
637
|
case FlexDirection.ROW:
|
|
582
638
|
case FlexDirection.ROW_REVERSE:
|
|
@@ -592,24 +648,24 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
592
648
|
throw new Error('Invalid flex direction: ' + flexDirection);
|
|
593
649
|
}
|
|
594
650
|
if (mode === EXACTLY) {
|
|
595
|
-
|
|
651
|
+
var totalCrossSize_1 = this._getSumOfCrossSize() + paddingAlongCrossAxis;
|
|
596
652
|
if (this._flexLines.length === 1) {
|
|
597
653
|
this._flexLines[0]._crossSize = size - paddingAlongCrossAxis;
|
|
598
654
|
}
|
|
599
|
-
else if (this._flexLines.length >= 2 &&
|
|
655
|
+
else if (this._flexLines.length >= 2 && totalCrossSize_1 < size) {
|
|
600
656
|
switch (this.alignContent) {
|
|
601
657
|
case AlignContent.STRETCH:
|
|
602
|
-
(()
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
for (
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
if (i ===
|
|
658
|
+
(function () {
|
|
659
|
+
var freeSpaceUnit = (size - totalCrossSize_1) / _this._flexLines.length;
|
|
660
|
+
var accumulatedError = 0;
|
|
661
|
+
for (var i = 0, flexLinesSize = _this._flexLines.length; i < flexLinesSize; i++) {
|
|
662
|
+
var flexLine = _this._flexLines[i];
|
|
663
|
+
var newCrossSizeAsFloat = flexLine._crossSize + freeSpaceUnit;
|
|
664
|
+
if (i === _this._flexLines.length - 1) {
|
|
609
665
|
newCrossSizeAsFloat += accumulatedError;
|
|
610
666
|
accumulatedError = 0;
|
|
611
667
|
}
|
|
612
|
-
|
|
668
|
+
var newCrossSize = Math.round(newCrossSizeAsFloat);
|
|
613
669
|
accumulatedError += newCrossSizeAsFloat - newCrossSize;
|
|
614
670
|
if (accumulatedError > 1) {
|
|
615
671
|
newCrossSize += 1;
|
|
@@ -624,34 +680,34 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
624
680
|
})();
|
|
625
681
|
break;
|
|
626
682
|
case AlignContent.SPACE_AROUND:
|
|
627
|
-
(()
|
|
628
|
-
|
|
629
|
-
|
|
683
|
+
(function () {
|
|
684
|
+
var spaceTopAndBottom = size - totalCrossSize_1;
|
|
685
|
+
var numberOfSpaces = _this._flexLines.length * 2;
|
|
630
686
|
spaceTopAndBottom = spaceTopAndBottom / numberOfSpaces;
|
|
631
|
-
|
|
632
|
-
|
|
687
|
+
var newFlexLines = [];
|
|
688
|
+
var dummySpaceFlexLine = new FlexLine();
|
|
633
689
|
dummySpaceFlexLine._crossSize = spaceTopAndBottom;
|
|
634
|
-
|
|
690
|
+
_this._flexLines.forEach(function (flexLine) {
|
|
635
691
|
newFlexLines.push(dummySpaceFlexLine);
|
|
636
692
|
newFlexLines.push(flexLine);
|
|
637
693
|
newFlexLines.push(dummySpaceFlexLine);
|
|
638
694
|
});
|
|
639
|
-
|
|
695
|
+
_this._flexLines = newFlexLines;
|
|
640
696
|
})();
|
|
641
697
|
break;
|
|
642
698
|
case AlignContent.SPACE_BETWEEN:
|
|
643
|
-
(()
|
|
644
|
-
|
|
645
|
-
|
|
699
|
+
(function () {
|
|
700
|
+
var spaceBetweenFlexLine = size - totalCrossSize_1;
|
|
701
|
+
var numberOfSpaces = _this._flexLines.length - 1;
|
|
646
702
|
spaceBetweenFlexLine = spaceBetweenFlexLine / numberOfSpaces;
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
for (
|
|
650
|
-
|
|
703
|
+
var accumulatedError = 0;
|
|
704
|
+
var newFlexLines = [];
|
|
705
|
+
for (var i = 0, flexLineSize = _this._flexLines.length; i < flexLineSize; i++) {
|
|
706
|
+
var flexLine = _this._flexLines[i];
|
|
651
707
|
newFlexLines.push(flexLine);
|
|
652
|
-
if (i !==
|
|
653
|
-
|
|
654
|
-
if (i ===
|
|
708
|
+
if (i !== _this._flexLines.length - 1) {
|
|
709
|
+
var dummySpaceFlexLine = new FlexLine();
|
|
710
|
+
if (i === _this._flexLines.length - 2) {
|
|
655
711
|
dummySpaceFlexLine._crossSize = Math.round(spaceBetweenFlexLine + accumulatedError);
|
|
656
712
|
accumulatedError = 0;
|
|
657
713
|
}
|
|
@@ -670,20 +726,20 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
670
726
|
newFlexLines.push(dummySpaceFlexLine);
|
|
671
727
|
}
|
|
672
728
|
}
|
|
673
|
-
|
|
729
|
+
_this._flexLines = newFlexLines;
|
|
674
730
|
})();
|
|
675
731
|
break;
|
|
676
732
|
case AlignContent.CENTER: {
|
|
677
|
-
|
|
733
|
+
var spaceAboveAndBottom = size - totalCrossSize_1;
|
|
678
734
|
spaceAboveAndBottom = spaceAboveAndBottom / 2;
|
|
679
|
-
|
|
680
|
-
|
|
735
|
+
var newFlexLines = [];
|
|
736
|
+
var dummySpaceFlexLine = new FlexLine();
|
|
681
737
|
dummySpaceFlexLine._crossSize = spaceAboveAndBottom;
|
|
682
|
-
for (
|
|
738
|
+
for (var i = 0, flexLineSize = this._flexLines.length; i < flexLineSize; i++) {
|
|
683
739
|
if (i === 0) {
|
|
684
740
|
newFlexLines.push(dummySpaceFlexLine);
|
|
685
741
|
}
|
|
686
|
-
|
|
742
|
+
var flexLine = this._flexLines[i];
|
|
687
743
|
newFlexLines.push(flexLine);
|
|
688
744
|
if (i === this._flexLines.length - 1) {
|
|
689
745
|
newFlexLines.push(dummySpaceFlexLine);
|
|
@@ -693,8 +749,8 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
693
749
|
break;
|
|
694
750
|
}
|
|
695
751
|
case AlignContent.FLEX_END: {
|
|
696
|
-
|
|
697
|
-
|
|
752
|
+
var spaceTop = size - totalCrossSize_1;
|
|
753
|
+
var dummySpaceFlexLine = new FlexLine();
|
|
698
754
|
dummySpaceFlexLine._crossSize = spaceTop;
|
|
699
755
|
this._flexLines.unshift(dummySpaceFlexLine);
|
|
700
756
|
break;
|
|
@@ -702,25 +758,26 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
702
758
|
}
|
|
703
759
|
}
|
|
704
760
|
}
|
|
705
|
-
}
|
|
706
|
-
_stretchViews(flexDirection, alignItems) {
|
|
761
|
+
};
|
|
762
|
+
FlexboxLayout.prototype._stretchViews = function (flexDirection, alignItems) {
|
|
763
|
+
var _this = this;
|
|
707
764
|
if (alignItems === AlignItems.STRETCH) {
|
|
708
|
-
|
|
709
|
-
this._flexLines.forEach((flexLine)
|
|
710
|
-
for (
|
|
711
|
-
|
|
712
|
-
|
|
765
|
+
var viewIndex_2 = 0;
|
|
766
|
+
this._flexLines.forEach(function (flexLine) {
|
|
767
|
+
for (var i = 0; i < flexLine.itemCount; i++, viewIndex_2++) {
|
|
768
|
+
var view = _this._getReorderedChildAt(viewIndex_2);
|
|
769
|
+
var alignSelf = FlexboxLayout.getAlignSelf(view);
|
|
713
770
|
if (alignSelf !== 'auto' && alignSelf !== 'stretch') {
|
|
714
771
|
continue;
|
|
715
772
|
}
|
|
716
773
|
switch (flexDirection) {
|
|
717
774
|
case FlexDirection.ROW:
|
|
718
775
|
case FlexDirection.ROW_REVERSE:
|
|
719
|
-
|
|
776
|
+
_this._stretchViewVertically(view, flexLine._crossSize);
|
|
720
777
|
break;
|
|
721
778
|
case FlexDirection.COLUMN:
|
|
722
779
|
case FlexDirection.COLUMN_REVERSE:
|
|
723
|
-
|
|
780
|
+
_this._stretchViewHorizontally(view, flexLine._crossSize);
|
|
724
781
|
break;
|
|
725
782
|
default:
|
|
726
783
|
throw new Error('Invalid flex direction: ' + flexDirection);
|
|
@@ -729,17 +786,17 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
729
786
|
});
|
|
730
787
|
}
|
|
731
788
|
else {
|
|
732
|
-
this._flexLines.forEach((flexLine)
|
|
733
|
-
flexLine._indicesAlignSelfStretch.forEach((index)
|
|
734
|
-
|
|
789
|
+
this._flexLines.forEach(function (flexLine) {
|
|
790
|
+
flexLine._indicesAlignSelfStretch.forEach(function (index) {
|
|
791
|
+
var view = _this._getReorderedChildAt(index);
|
|
735
792
|
switch (flexDirection) {
|
|
736
793
|
case FlexDirection.ROW:
|
|
737
794
|
case FlexDirection.ROW_REVERSE:
|
|
738
|
-
|
|
795
|
+
_this._stretchViewVertically(view, flexLine._crossSize);
|
|
739
796
|
break;
|
|
740
797
|
case FlexDirection.COLUMN:
|
|
741
798
|
case FlexDirection.COLUMN_REVERSE:
|
|
742
|
-
|
|
799
|
+
_this._stretchViewHorizontally(view, flexLine._crossSize);
|
|
743
800
|
break;
|
|
744
801
|
default:
|
|
745
802
|
throw new Error('Invalid flex direction: ' + flexDirection);
|
|
@@ -747,30 +804,30 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
747
804
|
});
|
|
748
805
|
});
|
|
749
806
|
}
|
|
750
|
-
}
|
|
751
|
-
_stretchViewVertically(view, crossSize) {
|
|
752
|
-
|
|
807
|
+
};
|
|
808
|
+
FlexboxLayout.prototype._stretchViewVertically = function (view, crossSize) {
|
|
809
|
+
var newHeight = crossSize - view.effectiveMarginTop - view.effectiveMarginBottom;
|
|
753
810
|
newHeight = Math.max(newHeight, 0);
|
|
754
|
-
|
|
755
|
-
|
|
811
|
+
var originalMeasuredWidth = view.getMeasuredWidth();
|
|
812
|
+
var childWidthMeasureSpec = FlexboxLayout.getChildMeasureSpec(this._currentWidthMeasureSpec, view.effectivePaddingLeft + view.effectivePaddingRight + view.effectiveMarginLeft + view.effectiveMarginRight, view.effectiveWidth < 0 ? WRAP_CONTENT : Math.min(view.effectiveWidth, originalMeasuredWidth));
|
|
756
813
|
view.measure(childWidthMeasureSpec, makeMeasureSpec(newHeight, EXACTLY));
|
|
757
814
|
if (originalMeasuredWidth > view.getMeasuredWidth()) {
|
|
758
815
|
childWidthMeasureSpec = makeMeasureSpec(originalMeasuredWidth, EXACTLY);
|
|
759
816
|
view.measure(childWidthMeasureSpec, makeMeasureSpec(newHeight, EXACTLY));
|
|
760
817
|
}
|
|
761
|
-
}
|
|
762
|
-
_stretchViewHorizontally(view, crossSize) {
|
|
763
|
-
|
|
818
|
+
};
|
|
819
|
+
FlexboxLayout.prototype._stretchViewHorizontally = function (view, crossSize) {
|
|
820
|
+
var newWidth = crossSize - view.effectiveMarginLeft - view.effectiveMarginRight;
|
|
764
821
|
newWidth = Math.max(newWidth, 0);
|
|
765
822
|
view.measure(makeMeasureSpec(newWidth, EXACTLY), makeMeasureSpec(view.getMeasuredHeight(), EXACTLY));
|
|
766
|
-
}
|
|
767
|
-
_setMeasuredDimensionForFlex(flexDirection, widthMeasureSpec, heightMeasureSpec, childState) {
|
|
768
|
-
|
|
769
|
-
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
823
|
+
};
|
|
824
|
+
FlexboxLayout.prototype._setMeasuredDimensionForFlex = function (flexDirection, widthMeasureSpec, heightMeasureSpec, childState) {
|
|
825
|
+
var widthMode = getMeasureSpecMode(widthMeasureSpec);
|
|
826
|
+
var widthSize = getMeasureSpecSize(widthMeasureSpec);
|
|
827
|
+
var heightMode = getMeasureSpecMode(heightMeasureSpec);
|
|
828
|
+
var heightSize = getMeasureSpecSize(heightMeasureSpec);
|
|
829
|
+
var calculatedMaxHeight;
|
|
830
|
+
var calculatedMaxWidth;
|
|
774
831
|
switch (flexDirection) {
|
|
775
832
|
case FlexDirection.ROW:
|
|
776
833
|
case FlexDirection.ROW_REVERSE:
|
|
@@ -785,7 +842,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
785
842
|
default:
|
|
786
843
|
throw new Error('Invalid flex direction: ' + flexDirection);
|
|
787
844
|
}
|
|
788
|
-
|
|
845
|
+
var widthSizeAndState;
|
|
789
846
|
switch (widthMode) {
|
|
790
847
|
case EXACTLY:
|
|
791
848
|
if (widthSize < calculatedMaxWidth) {
|
|
@@ -810,7 +867,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
810
867
|
default:
|
|
811
868
|
throw new Error('Unknown width mode is set: ' + widthMode);
|
|
812
869
|
}
|
|
813
|
-
|
|
870
|
+
var heightSizeAndState;
|
|
814
871
|
switch (heightMode) {
|
|
815
872
|
case EXACTLY:
|
|
816
873
|
if (heightSize < calculatedMaxHeight) {
|
|
@@ -836,8 +893,8 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
836
893
|
throw new Error('Unknown height mode is set: ' + heightMode);
|
|
837
894
|
}
|
|
838
895
|
this.setMeasuredDimension(widthSizeAndState, heightSizeAndState);
|
|
839
|
-
}
|
|
840
|
-
_isWrapRequired(child, mode, maxSize, currentLength, childLength, childAbsoluteIndex, childRelativeIndexInFlexLine) {
|
|
896
|
+
};
|
|
897
|
+
FlexboxLayout.prototype._isWrapRequired = function (child, mode, maxSize, currentLength, childLength, childAbsoluteIndex, childRelativeIndexInFlexLine) {
|
|
841
898
|
if (this.flexWrap === FlexWrap.NOWRAP) {
|
|
842
899
|
return false;
|
|
843
900
|
}
|
|
@@ -849,20 +906,20 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
849
906
|
}
|
|
850
907
|
// Omit divider
|
|
851
908
|
return maxSize < currentLength + childLength;
|
|
852
|
-
}
|
|
853
|
-
_getLargestMainSize() {
|
|
854
|
-
return this._flexLines.reduce((max, flexLine)
|
|
855
|
-
}
|
|
856
|
-
_getSumOfCrossSize() {
|
|
909
|
+
};
|
|
910
|
+
FlexboxLayout.prototype._getLargestMainSize = function () {
|
|
911
|
+
return this._flexLines.reduce(function (max, flexLine) { return Math.max(max, flexLine.mainSize); }, Number.MIN_VALUE);
|
|
912
|
+
};
|
|
913
|
+
FlexboxLayout.prototype._getSumOfCrossSize = function () {
|
|
857
914
|
// Omit divider
|
|
858
|
-
return this._flexLines.reduce((sum, flexLine)
|
|
859
|
-
}
|
|
860
|
-
_isMainAxisDirectionHorizontal(flexDirection) {
|
|
915
|
+
return this._flexLines.reduce(function (sum, flexLine) { return sum + flexLine._crossSize; }, 0);
|
|
916
|
+
};
|
|
917
|
+
FlexboxLayout.prototype._isMainAxisDirectionHorizontal = function (flexDirection) {
|
|
861
918
|
return flexDirection === FlexDirection.ROW || flexDirection === FlexDirection.ROW_REVERSE;
|
|
862
|
-
}
|
|
863
|
-
onLayout(left, top, right, bottom) {
|
|
864
|
-
|
|
865
|
-
|
|
919
|
+
};
|
|
920
|
+
FlexboxLayout.prototype.onLayout = function (left, top, right, bottom) {
|
|
921
|
+
var insets = this.getSafeAreaInsets();
|
|
922
|
+
var isRtl;
|
|
866
923
|
switch (this.flexDirection) {
|
|
867
924
|
case FlexDirection.ROW:
|
|
868
925
|
isRtl = false;
|
|
@@ -889,25 +946,26 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
889
946
|
default:
|
|
890
947
|
throw new Error('Invalid flex direction is set: ' + this.flexDirection);
|
|
891
948
|
}
|
|
892
|
-
}
|
|
893
|
-
_layoutHorizontal(isRtl, left, top, right, bottom, insets) {
|
|
949
|
+
};
|
|
950
|
+
FlexboxLayout.prototype._layoutHorizontal = function (isRtl, left, top, right, bottom, insets) {
|
|
951
|
+
var _this = this;
|
|
894
952
|
// include insets
|
|
895
|
-
|
|
896
|
-
|
|
897
|
-
|
|
898
|
-
|
|
899
|
-
|
|
900
|
-
|
|
901
|
-
|
|
902
|
-
|
|
953
|
+
var paddingLeft = this.effectivePaddingLeft + insets.left;
|
|
954
|
+
var paddingTop = this.effectivePaddingTop + insets.top;
|
|
955
|
+
var paddingRight = this.effectivePaddingRight + insets.right;
|
|
956
|
+
var paddingBottom = this.effectivePaddingBottom + insets.bottom;
|
|
957
|
+
var childLeft;
|
|
958
|
+
var currentViewIndex = 0;
|
|
959
|
+
var height = bottom - top;
|
|
960
|
+
var width = right - left;
|
|
903
961
|
// include insets
|
|
904
|
-
|
|
905
|
-
|
|
906
|
-
|
|
907
|
-
this._flexLines.forEach((flexLine, i)
|
|
962
|
+
var childBottom = height - paddingBottom;
|
|
963
|
+
var childTop = paddingTop;
|
|
964
|
+
var childRight;
|
|
965
|
+
this._flexLines.forEach(function (flexLine, i) {
|
|
908
966
|
// Omit divider
|
|
909
|
-
|
|
910
|
-
switch (
|
|
967
|
+
var spaceBetweenItem = 0.0;
|
|
968
|
+
switch (_this.justifyContent) {
|
|
911
969
|
case JustifyContent.FLEX_START:
|
|
912
970
|
childLeft = paddingLeft;
|
|
913
971
|
childRight = width - paddingRight;
|
|
@@ -929,17 +987,17 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
929
987
|
break;
|
|
930
988
|
case JustifyContent.SPACE_BETWEEN: {
|
|
931
989
|
childLeft = paddingLeft;
|
|
932
|
-
|
|
990
|
+
var denominator = flexLine.itemCount !== 1 ? flexLine.itemCount - 1 : 1.0;
|
|
933
991
|
spaceBetweenItem = (width - insets.left - insets.right - flexLine.mainSize) / denominator;
|
|
934
992
|
childRight = width - paddingRight;
|
|
935
993
|
break;
|
|
936
994
|
}
|
|
937
995
|
default:
|
|
938
|
-
throw new Error('Invalid justifyContent is set: ' +
|
|
996
|
+
throw new Error('Invalid justifyContent is set: ' + _this.justifyContent);
|
|
939
997
|
}
|
|
940
998
|
spaceBetweenItem = Math.max(spaceBetweenItem, 0);
|
|
941
|
-
for (
|
|
942
|
-
|
|
999
|
+
for (var j = 0; j < flexLine.itemCount; j++) {
|
|
1000
|
+
var child = _this._getReorderedChildAt(currentViewIndex);
|
|
943
1001
|
if (child === null) {
|
|
944
1002
|
continue;
|
|
945
1003
|
}
|
|
@@ -947,30 +1005,30 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
947
1005
|
currentViewIndex++;
|
|
948
1006
|
continue;
|
|
949
1007
|
}
|
|
950
|
-
|
|
1008
|
+
var lp = child; // .style;
|
|
951
1009
|
childLeft += lp.effectiveMarginLeft;
|
|
952
1010
|
childRight -= lp.effectiveMarginRight;
|
|
953
1011
|
// Omit divider
|
|
954
|
-
if (
|
|
1012
|
+
if (_this.flexWrap === FlexWrap.WRAP_REVERSE) {
|
|
955
1013
|
if (isRtl) {
|
|
956
|
-
|
|
1014
|
+
_this._layoutSingleChildHorizontal(child, flexLine, _this.flexWrap, _this.alignItems, Math.round(childRight) - child.getMeasuredWidth(), childBottom - child.getMeasuredHeight(), Math.round(childRight), childBottom);
|
|
957
1015
|
}
|
|
958
1016
|
else {
|
|
959
|
-
|
|
1017
|
+
_this._layoutSingleChildHorizontal(child, flexLine, _this.flexWrap, _this.alignItems, Math.round(childLeft), childBottom - child.getMeasuredHeight(), Math.round(childLeft) + child.getMeasuredWidth(), childBottom);
|
|
960
1018
|
}
|
|
961
1019
|
}
|
|
962
1020
|
else {
|
|
963
1021
|
if (isRtl) {
|
|
964
|
-
|
|
1022
|
+
_this._layoutSingleChildHorizontal(child, flexLine, _this.flexWrap, _this.alignItems, Math.round(childRight) - child.getMeasuredWidth(), childTop, Math.round(childRight), childTop + child.getMeasuredHeight());
|
|
965
1023
|
}
|
|
966
1024
|
else {
|
|
967
|
-
|
|
1025
|
+
_this._layoutSingleChildHorizontal(child, flexLine, _this.flexWrap, _this.alignItems, Math.round(childLeft), childTop, Math.round(childLeft) + child.getMeasuredWidth(), childTop + child.getMeasuredHeight());
|
|
968
1026
|
}
|
|
969
1027
|
}
|
|
970
1028
|
childLeft += child.getMeasuredWidth() + spaceBetweenItem + lp.effectiveMarginRight;
|
|
971
1029
|
childRight -= child.getMeasuredWidth() + spaceBetweenItem + lp.effectiveMarginLeft;
|
|
972
1030
|
currentViewIndex++;
|
|
973
|
-
|
|
1031
|
+
var bounds = child._getCurrentLayoutBounds();
|
|
974
1032
|
flexLine._left = Math.min(flexLine._left, bounds.left - lp.effectiveMarginLeft);
|
|
975
1033
|
flexLine._top = Math.min(flexLine._top, bounds.top - lp.effectiveMarginTop);
|
|
976
1034
|
flexLine._right = Math.max(flexLine._right, bounds.right + lp.effectiveMarginRight);
|
|
@@ -979,14 +1037,14 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
979
1037
|
childTop += flexLine._crossSize;
|
|
980
1038
|
childBottom -= flexLine._crossSize;
|
|
981
1039
|
});
|
|
982
|
-
}
|
|
983
|
-
_layoutSingleChildHorizontal(view, flexLine, flexWrap, alignItems, left, top, right, bottom) {
|
|
984
|
-
|
|
985
|
-
|
|
1040
|
+
};
|
|
1041
|
+
FlexboxLayout.prototype._layoutSingleChildHorizontal = function (view, flexLine, flexWrap, alignItems, left, top, right, bottom) {
|
|
1042
|
+
var lp = view; // .style;
|
|
1043
|
+
var alignSelf = FlexboxLayout.getAlignSelf(view);
|
|
986
1044
|
if (alignSelf !== 'auto') {
|
|
987
1045
|
alignItems = alignSelf;
|
|
988
1046
|
}
|
|
989
|
-
|
|
1047
|
+
var crossSize = flexLine._crossSize;
|
|
990
1048
|
switch (alignItems) {
|
|
991
1049
|
case AlignItems.FLEX_START:
|
|
992
1050
|
case AlignItems.STRETCH:
|
|
@@ -999,12 +1057,12 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
999
1057
|
break;
|
|
1000
1058
|
case AlignItems.BASELINE:
|
|
1001
1059
|
if (flexWrap !== FlexWrap.WRAP_REVERSE) {
|
|
1002
|
-
|
|
1060
|
+
var marginTop = flexLine._maxBaseline - FlexboxLayout.getBaseline(view);
|
|
1003
1061
|
marginTop = Math.max(marginTop, lp.effectiveMarginTop);
|
|
1004
1062
|
view.layout(left, top + marginTop, right, bottom + marginTop);
|
|
1005
1063
|
}
|
|
1006
1064
|
else {
|
|
1007
|
-
|
|
1065
|
+
var marginBottom = flexLine._maxBaseline - view.getMeasuredHeight() + FlexboxLayout.getBaseline(view);
|
|
1008
1066
|
marginBottom = Math.max(marginBottom, lp.effectiveMarginBottom);
|
|
1009
1067
|
view.layout(left, top - marginBottom, right, bottom - marginBottom);
|
|
1010
1068
|
}
|
|
@@ -1018,7 +1076,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
1018
1076
|
}
|
|
1019
1077
|
break;
|
|
1020
1078
|
case AlignItems.CENTER: {
|
|
1021
|
-
|
|
1079
|
+
var topFromCrossAxis = (crossSize - view.getMeasuredHeight()) / 2;
|
|
1022
1080
|
if (flexWrap !== FlexWrap.WRAP_REVERSE) {
|
|
1023
1081
|
view.layout(left, top + topFromCrossAxis + lp.effectiveMarginTop - lp.effectiveMarginBottom, right, top + topFromCrossAxis + view.getMeasuredHeight() + lp.effectiveMarginTop - lp.effectiveMarginBottom);
|
|
1024
1082
|
}
|
|
@@ -1028,23 +1086,24 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
1028
1086
|
break;
|
|
1029
1087
|
}
|
|
1030
1088
|
}
|
|
1031
|
-
}
|
|
1032
|
-
_layoutVertical(isRtl, fromBottomToTop, left, top, right, bottom, insets) {
|
|
1033
|
-
|
|
1034
|
-
|
|
1035
|
-
|
|
1036
|
-
|
|
1037
|
-
|
|
1038
|
-
|
|
1039
|
-
|
|
1040
|
-
|
|
1041
|
-
|
|
1042
|
-
|
|
1043
|
-
|
|
1044
|
-
|
|
1089
|
+
};
|
|
1090
|
+
FlexboxLayout.prototype._layoutVertical = function (isRtl, fromBottomToTop, left, top, right, bottom, insets) {
|
|
1091
|
+
var _this = this;
|
|
1092
|
+
var paddingLeft = this.effectivePaddingLeft + insets.left;
|
|
1093
|
+
var paddingTop = this.effectivePaddingTop + insets.top;
|
|
1094
|
+
var paddingRight = this.effectivePaddingRight + insets.right;
|
|
1095
|
+
var paddingBottom = this.effectivePaddingBottom + insets.bottom;
|
|
1096
|
+
var childLeft = paddingLeft;
|
|
1097
|
+
var currentViewIndex = 0;
|
|
1098
|
+
var width = right - left;
|
|
1099
|
+
var height = bottom - top;
|
|
1100
|
+
var childRight = width - paddingRight;
|
|
1101
|
+
var childTop;
|
|
1102
|
+
var childBottom;
|
|
1103
|
+
this._flexLines.forEach(function (flexLine) {
|
|
1045
1104
|
// Omit divider.
|
|
1046
|
-
|
|
1047
|
-
switch (
|
|
1105
|
+
var spaceBetweenItem = 0.0;
|
|
1106
|
+
switch (_this.justifyContent) {
|
|
1048
1107
|
case JustifyContent.FLEX_START:
|
|
1049
1108
|
childTop = paddingTop;
|
|
1050
1109
|
childBottom = height - paddingBottom;
|
|
@@ -1066,17 +1125,17 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
1066
1125
|
break;
|
|
1067
1126
|
case JustifyContent.SPACE_BETWEEN: {
|
|
1068
1127
|
childTop = paddingTop;
|
|
1069
|
-
|
|
1128
|
+
var denominator = flexLine.itemCount !== 1 ? flexLine.itemCount - 1 : 1.0;
|
|
1070
1129
|
spaceBetweenItem = (height - insets.top - insets.bottom - flexLine.mainSize) / denominator;
|
|
1071
1130
|
childBottom = height - paddingBottom;
|
|
1072
1131
|
break;
|
|
1073
1132
|
}
|
|
1074
1133
|
default:
|
|
1075
|
-
throw new Error('Invalid justifyContent is set: ' +
|
|
1134
|
+
throw new Error('Invalid justifyContent is set: ' + _this.justifyContent);
|
|
1076
1135
|
}
|
|
1077
1136
|
spaceBetweenItem = Math.max(spaceBetweenItem, 0);
|
|
1078
|
-
for (
|
|
1079
|
-
|
|
1137
|
+
for (var j = 0; j < flexLine.itemCount; j++) {
|
|
1138
|
+
var child = _this._getReorderedChildAt(currentViewIndex);
|
|
1080
1139
|
if (child === null) {
|
|
1081
1140
|
continue;
|
|
1082
1141
|
}
|
|
@@ -1084,30 +1143,30 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
1084
1143
|
currentViewIndex++;
|
|
1085
1144
|
continue;
|
|
1086
1145
|
}
|
|
1087
|
-
|
|
1146
|
+
var lp = child; // .style;
|
|
1088
1147
|
childTop += lp.effectiveMarginTop;
|
|
1089
1148
|
childBottom -= lp.effectiveMarginBottom;
|
|
1090
1149
|
// Omit divider.
|
|
1091
1150
|
if (isRtl) {
|
|
1092
1151
|
if (fromBottomToTop) {
|
|
1093
|
-
|
|
1152
|
+
_this._layoutSingleChildVertical(child, flexLine, true, _this.alignItems, childRight - child.getMeasuredWidth(), Math.round(childBottom) - child.getMeasuredHeight(), childRight, Math.round(childBottom));
|
|
1094
1153
|
}
|
|
1095
1154
|
else {
|
|
1096
|
-
|
|
1155
|
+
_this._layoutSingleChildVertical(child, flexLine, true, _this.alignItems, childRight - child.getMeasuredWidth(), Math.round(childTop), childRight, Math.round(childTop) + child.getMeasuredHeight());
|
|
1097
1156
|
}
|
|
1098
1157
|
}
|
|
1099
1158
|
else {
|
|
1100
1159
|
if (fromBottomToTop) {
|
|
1101
|
-
|
|
1160
|
+
_this._layoutSingleChildVertical(child, flexLine, false, _this.alignItems, childLeft, Math.round(childBottom) - child.getMeasuredHeight(), childLeft + child.getMeasuredWidth(), Math.round(childBottom));
|
|
1102
1161
|
}
|
|
1103
1162
|
else {
|
|
1104
|
-
|
|
1163
|
+
_this._layoutSingleChildVertical(child, flexLine, false, _this.alignItems, childLeft, Math.round(childTop), childLeft + child.getMeasuredWidth(), Math.round(childTop) + child.getMeasuredHeight());
|
|
1105
1164
|
}
|
|
1106
1165
|
}
|
|
1107
1166
|
childTop += child.getMeasuredHeight() + spaceBetweenItem + lp.effectiveMarginBottom;
|
|
1108
1167
|
childBottom -= child.getMeasuredHeight() + spaceBetweenItem + lp.effectiveMarginTop;
|
|
1109
1168
|
currentViewIndex++;
|
|
1110
|
-
|
|
1169
|
+
var bounds = child._getCurrentLayoutBounds();
|
|
1111
1170
|
flexLine._left = Math.min(flexLine._left, bounds.left - lp.effectiveMarginLeft);
|
|
1112
1171
|
flexLine._top = Math.min(flexLine._top, bounds.top - lp.effectiveMarginTop);
|
|
1113
1172
|
flexLine._right = Math.max(flexLine._right, bounds.right + lp.effectiveMarginRight);
|
|
@@ -1116,14 +1175,14 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
1116
1175
|
childLeft += flexLine.crossSize;
|
|
1117
1176
|
childRight -= flexLine.crossSize;
|
|
1118
1177
|
});
|
|
1119
|
-
}
|
|
1120
|
-
_layoutSingleChildVertical(view, flexLine, isRtl, alignItems, left, top, right, bottom) {
|
|
1121
|
-
|
|
1122
|
-
|
|
1178
|
+
};
|
|
1179
|
+
FlexboxLayout.prototype._layoutSingleChildVertical = function (view, flexLine, isRtl, alignItems, left, top, right, bottom) {
|
|
1180
|
+
var lp = view; // .style;
|
|
1181
|
+
var alignSelf = FlexboxLayout.getAlignSelf(view);
|
|
1123
1182
|
if (alignSelf !== 'auto') {
|
|
1124
1183
|
alignItems = alignSelf;
|
|
1125
1184
|
}
|
|
1126
|
-
|
|
1185
|
+
var crossSize = flexLine.crossSize;
|
|
1127
1186
|
switch (alignItems) {
|
|
1128
1187
|
case AlignItems.FLEX_START:
|
|
1129
1188
|
case AlignItems.STRETCH:
|
|
@@ -1146,7 +1205,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
1146
1205
|
}
|
|
1147
1206
|
break;
|
|
1148
1207
|
case AlignItems.CENTER: {
|
|
1149
|
-
|
|
1208
|
+
var leftFromCrossAxis = (crossSize - view.getMeasuredWidth()) / 2;
|
|
1150
1209
|
if (!isRtl) {
|
|
1151
1210
|
view.layout(left + leftFromCrossAxis + lp.effectiveMarginLeft - lp.effectiveMarginRight, top, right + leftFromCrossAxis + lp.effectiveMarginLeft - lp.effectiveMarginRight, bottom);
|
|
1152
1211
|
}
|
|
@@ -1156,16 +1215,16 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
1156
1215
|
break;
|
|
1157
1216
|
}
|
|
1158
1217
|
}
|
|
1159
|
-
}
|
|
1218
|
+
};
|
|
1160
1219
|
// Omit divider in onDraw(), drawDividersHorizontal, drawDividersVertical, drawVerticalDivider
|
|
1161
1220
|
// requestLayout on set flexDirection, set flexWrap, set justifyContent, set alignItems, set alignContent
|
|
1162
1221
|
// NOTE Consider moving to View if frequently used
|
|
1163
|
-
|
|
1164
|
-
|
|
1165
|
-
|
|
1166
|
-
|
|
1167
|
-
|
|
1168
|
-
|
|
1222
|
+
FlexboxLayout.getChildMeasureSpec = function (spec, padding, childDimension) {
|
|
1223
|
+
var specMode = layout.getMeasureSpecMode(spec);
|
|
1224
|
+
var specSize = layout.getMeasureSpecSize(spec);
|
|
1225
|
+
var size = Math.max(0, specSize - padding);
|
|
1226
|
+
var resultSize = 0;
|
|
1227
|
+
var resultMode = 0;
|
|
1169
1228
|
switch (specMode) {
|
|
1170
1229
|
// Parent has imposed an exact size on us
|
|
1171
1230
|
case EXACTLY:
|
|
@@ -1212,8 +1271,10 @@ export class FlexboxLayout extends FlexboxLayoutBase {
|
|
|
1212
1271
|
break;
|
|
1213
1272
|
}
|
|
1214
1273
|
return layout.makeMeasureSpec(resultSize, resultMode);
|
|
1215
|
-
}
|
|
1216
|
-
|
|
1274
|
+
};
|
|
1275
|
+
return FlexboxLayout;
|
|
1276
|
+
}(FlexboxLayoutBase));
|
|
1277
|
+
export { FlexboxLayout };
|
|
1217
1278
|
(function (FlexboxLayout) {
|
|
1218
1279
|
function getBaseline(child) {
|
|
1219
1280
|
// TODO: Check if we support baseline for iOS.
|