@nativescript/core 8.2.0-alpha.10 → 8.2.0-alpha.11

package/accessibility/accessibility-service.android.js

@@ -53,16 +53,18 @@ function ensureStateListener() {
             }
         },
     });
-    touchExplorationStateChangeListener = new android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener({
-        onTouchExplorationStateChanged(enabled) {
-            updateAccessibilityState();
-            if (Trace.isEnabled()) {
-                Trace.write(`TouchExplorationStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
-            }
-        },
-    });
     accessibilityManager.addAccessibilityStateChangeListener(accessibilityStateChangeListener);
-    accessibilityManager.addTouchExplorationStateChangeListener(touchExplorationStateChangeListener);
+    if (android.os.Build.VERSION.SDK_INT >= 19) {
+        touchExplorationStateChangeListener = new android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener({
+            onTouchExplorationStateChanged(enabled) {
+                updateAccessibilityState();
+                if (Trace.isEnabled()) {
+                    Trace.write(`TouchExplorationStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
+                }
+            },
+        });
+        accessibilityManager.addTouchExplorationStateChangeListener(touchExplorationStateChangeListener);
+    }
     updateAccessibilityState();
     Application.on(Application.resumeEvent, updateAccessibilityState);
     return sharedA11YObservable;

package/accessibility/accessibility-service.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"accessibility-service.android.js","sourceRoot":"","sources":["../../../../packages/core/accessibility/accessibility-service.android.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"accessibility-service.android.js","sourceRoot":"","sources":["../../../../packages/core/accessibility/accessibility-service.android.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -3,7 +3,7 @@
   "main": "index",
   "types": "index.d.ts",
   "description": "A JavaScript library providing an easy to use api for interacting with iOS and Android platform APIs.",
-  "version": "8.2.0-alpha.10",
+  "version": "8.2.0-alpha.11",
   "homepage": "https://nativescript.org",
   "repository": {
     "type": "git",

package/ui/core/bindable/bindable-expressions.js

@@ -1,6 +1,7 @@
 import { parse } from 'acorn';
 import { isFunction, isNullOrUndefined, isObject } from '../../../utils/types';
 const expressionsCache = {};
+const FORCED_CHAIN_VALUE = Symbol('forcedChain');
 // prettier-ignore
 const unaryOperators = {
     '+': (v) => +v,
@@ -49,9 +50,12 @@ const expressionParsers = {
             throw new Error('Disallowed binary operator: ' + expression.operator);
         }
         const left = convertExpressionToValue(expression.left, model, isBackConvert, changedModel);
+        if (expression.operator == '|' && expression.right.type == 'CallExpression') {
+            expression.right.requiresConverter = true;
+        }
         const right = convertExpressionToValue(expression.right, model, isBackConvert, changedModel);
         if (expression.operator == '|') {
-            if (right != null && isFunction(right.callback) && right.context != null && right.args != null) {
+            if (expression.right.requiresConverter && right != null) {
                 right.args.unshift(left);
                 return right.callback.apply(right.context, right.args);
             }
@@ -60,31 +64,35 @@ const expressionParsers = {
         return binaryOperators[expression.operator](left, right);
     },
     'CallExpression': (expression, model, isBackConvert, changedModel) => {
-        var _a, _b;
-        let object;
-        let property;
-        if (expression.callee.type == 'MemberExpression') {
-            object = convertExpressionToValue(expression.callee.object, model, isBackConvert, changedModel);
-            property = expression.callee.computed ? convertExpressionToValue(expression.callee.property, model, isBackConvert, changedModel) : (_a = expression.callee.property) === null || _a === void 0 ? void 0 : _a.name;
+        expression.callee.requiresObjectAndProperty = true;
+        const { object, property } = convertExpressionToValue(expression.callee, model, isBackConvert, changedModel);
+        let callback;
+        if (object == FORCED_CHAIN_VALUE) {
+            callback = undefined;
         }
         else {
-            object = getContext(expression.callee.name, model, changedModel);
-            property = (_b = expression.callee) === null || _b === void 0 ? void 0 : _b.name;
+            callback = expression.callee.optional ? object === null || object === void 0 ? void 0 : object[property] : object[property];
         }
-        const callback = expression.callee.optional ? object === null || object === void 0 ? void 0 : object[property] : object[property];
-        if (isNullOrUndefined(callback)) {
+        if ((!expression.optional || expression.requiresConverter) && isNullOrUndefined(callback)) {
             throw new Error('Cannot perform a call using a null or undefined property');
         }
-        const isConverter = isObject(callback) && (isFunction(callback.toModel) || isFunction(callback.toView));
-        if (!isFunction(callback) && !isConverter) {
-            throw new Error('Cannot perform a call using a non-callable property');
+        if (expression.requiresConverter) {
+            if (isFunction(callback)) {
+                callback = { toView: callback };
+            }
+            else if (!isObject(callback) || !isFunction(callback.toModel) && !isFunction(callback.toView)) {
+                throw new Error('Invalid converter call');
+            }
         }
         const parsedArgs = [];
         for (let argument of expression.arguments) {
             let value = convertExpressionToValue(argument, model, isBackConvert, changedModel);
             argument.type == 'SpreadElement' ? parsedArgs.push(...value) : parsedArgs.push(value);
         }
-        return isConverter ? getConverter(callback, object, parsedArgs, isBackConvert) : callback.apply(object, parsedArgs);
+        if (expression.requiresConverter) {
+            return getConverter(callback, object, parsedArgs, isBackConvert);
+        }
+        return expression.optional ? callback === null || callback === void 0 ? void 0 : callback.apply(object, parsedArgs) : callback.apply(object, parsedArgs);
     },
     'ChainExpression': (expression, model, isBackConvert, changedModel) => {
         return convertExpressionToValue(expression.expression, model, isBackConvert, changedModel);
@@ -95,6 +103,9 @@ const expressionParsers = {
     },
     'Identifier': (expression, model, isBackConvert, changedModel) => {
         const context = getContext(expression.name, model, changedModel);
+        if (expression.requiresObjectAndProperty) {
+            return { object: context, property: expression.name };
+        }
         return context[expression.name];
     },
     'Literal': (expression, model, isBackConvert, changedModel) => {
@@ -109,8 +120,31 @@ const expressionParsers = {
     },
     'MemberExpression': (expression, model, isBackConvert, changedModel) => {
         var _a;
+        if (expression.object.type == 'MemberExpression') {
+            expression.object.isChained = true;
+        }
         const object = convertExpressionToValue(expression.object, model, isBackConvert, changedModel);
         const property = expression.computed ? convertExpressionToValue(expression.property, model, isBackConvert, changedModel) : (_a = expression.property) === null || _a === void 0 ? void 0 : _a.name;
+        const propertyInfo = { object, property };
+        if (expression.requiresObjectAndProperty) {
+            return propertyInfo;
+        }
+        /**
+         * If first member is undefined, make sure that no error is thrown later but return undefined instead.
+         * This behaviour is kept in order to cope with components whose binding context takes a bit long to load.
+         * Old parser would return undefined for an expression like 'property1.property2.property3'
+         * even if expression as a whole consisted of undefined properties.
+         * The new one will keep the same principle only if first member is undefined for safety reasons.
+         * It meddles with members specifically, so that it will not affect expression result as a whole.
+         * For example, an 'isLoading || isBusy' expression will be validated as 'undefined || undefined'
+         * if context is not ready.
+         */
+        if (object === undefined && expression.object.type == 'Identifier') {
+            return expression.isChained ? FORCED_CHAIN_VALUE : object;
+        }
+        if (object == FORCED_CHAIN_VALUE) {
+            return expression.isChained ? object : undefined;
+        }
         return expression.optional ? object === null || object === void 0 ? void 0 : object[property] : object[property];
     },
     'NewExpression': (expression, model, isBackConvert, changedModel) => {
@@ -193,6 +227,9 @@ export function parseExpression(expressionText) {
     return expression;
 }
 export function convertExpressionToValue(expression, model, isBackConvert, changedModel) {
+    if (!(expression.type in expressionParsers)) {
+        throw Error('Invalid expression syntax');
+    }
     return expressionParsers[expression.type](expression, model, isBackConvert, changedModel);
 }
 //# sourceMappingURL=bindable-expressions.js.map

package/ui/core/bindable/bindable-expressions.js.map

@@ -1 +1 @@
-{"version":3,"file":"bindable-expressions.js","sourceRoot":"","sources":["../../../../../../packages/core/ui/core/bindable/bindable-expressions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bindable-expressions.js","sourceRoot":"","sources":["../../../../../../packages/core/ui/core/bindable/bindable-expressions.ts"],"names":[],"mappings":"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"}

package/ui/core/bindable/index.js

@@ -248,8 +248,7 @@ export class Binding {
         }
         else if (this.options.expression) {
             const changedModel = {};
-            changedModel[bc.bindingValueKey] = value;
-            changedModel[bc.newPropertyValueKey] = value;
+            const targetInstance = this.target.get();
             let sourcePropertyName = '';
             if (this.sourceOptions) {
                 sourcePropertyName = this.sourceOptions.property;
@@ -257,11 +256,17 @@ export class Binding {
             else if (typeof this.options.sourceProperty === 'string' && this.options.sourceProperty.indexOf('.') === -1) {
                 sourcePropertyName = this.options.sourceProperty;
             }
+            const updateExpression = this.prepareExpressionForUpdate();
+            this.prepareContextForExpression(targetInstance, changedModel, updateExpression);
+            /**
+             * Wait for 'prepareContextForExpression' to assign keys first and override any possible occurences.
+             * For example, 'bindingValueKey' key can result in a circular reference if it's set in both cases.
+             */
+            changedModel[bc.bindingValueKey] = value;
+            changedModel[bc.newPropertyValueKey] = value;
             if (sourcePropertyName !== '') {
                 changedModel[sourcePropertyName] = value;
             }
-            const updateExpression = this.prepareExpressionForUpdate();
-            this.prepareContextForExpression(changedModel, updateExpression);
             const expressionValue = this._getExpressionValue(updateExpression, true, changedModel);
             if (expressionValue instanceof Error) {
                 Trace.write(expressionValue.message, Trace.categories.Binding, Trace.messageType.error);
@@ -271,9 +276,10 @@ export class Binding {
         this.updateSource(newValue);
     }
     _getExpressionValue(expression, isBackConvert, changedModel) {
-        let result = '';
+        let result = null;
         if (!__UI_USE_EXTERNAL_RENDERER__) {
             let context;
+            const targetInstance = this.target.get();
             const addedProps = [];
             try {
                 let exp;
@@ -281,7 +287,7 @@ export class Binding {
                     exp = parseExpression(expression);
                 }
                 catch (e) {
-                    result = e;
+                    result = new Error(e + ' at ' + targetInstance);
                 }
                 if (exp) {
                     context = (this.source && this.source.get && this.source.get()) || global;
@@ -293,19 +299,17 @@ export class Binding {
                         }
                     }
                     // For expressions, there are also cases when binding must be updated after component is loaded (e.g. ListView)
-                    if (this.prepareContextForExpression(context, expression, addedProps)) {
+                    if (this.prepareContextForExpression(targetInstance, context, expression, addedProps)) {
                         result = convertExpressionToValue(exp, context, isBackConvert, changedModel ? changedModel : context);
                     }
                     else {
-                        const targetInstance = this.target.get();
                         targetInstance.off('loaded', this.loadedHandlerVisualTreeBinding, this);
                         targetInstance.on('loaded', this.loadedHandlerVisualTreeBinding, this);
                     }
                 }
             }
             catch (e) {
-                const errorMessage = 'Run-time error occured in file: ' + e.sourceURL + ' at line: ' + e.line + ' and column: ' + e.column;
-                result = new Error(errorMessage);
+                result = new Error(e + ' at ' + targetInstance);
             }
             // Clear added props
             for (let prop of addedProps) {
@@ -374,8 +378,7 @@ export class Binding {
             }
         }
     }
-    prepareContextForExpression(model, expression, addedProps = []) {
-        const targetInstance = this.target.get();
+    prepareContextForExpression(target, model, expression, addedProps = []) {
         let success = true;
         let parentViewAndIndex;
         let parentView;
@@ -389,7 +392,7 @@ export class Binding {
             for (let i = 0; i < parentsArray.length; i++) {
                 // This prevents later checks to mistake $parents[] for $parent
                 expressionCP = expressionCP.replace(parentsArray[i], '');
-                parentViewAndIndex = this.getParentView(targetInstance, parentsArray[i]);
+                parentViewAndIndex = this.getParentView(target, parentsArray[i]);
                 if (parentViewAndIndex.view) {
                     model[bc.parentsValueKey] = model[bc.parentsValueKey] || {};
                     model[bc.parentsValueKey][parentViewAndIndex.index] = parentViewAndIndex.view.bindingContext;
@@ -401,7 +404,7 @@ export class Binding {
             }
         }
         if (expressionCP.indexOf(bc.parentValueKey) > -1) {
-            parentView = this.getParentView(targetInstance, bc.parentValueKey).view;
+            parentView = this.getParentView(target, bc.parentValueKey).view;
             if (parentView) {
                 model[bc.parentValueKey] = parentView.bindingContext;
                 addedProps.push(bc.parentValueKey);

package/ui/core/bindable/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/core/ui/core/bindable/index.ts"],"names":[],"mappings":"AAGA,WAAW;AACX,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAsB,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AACnF,OAAO,KAAK,KAAK,MAAM,sBAAsB,CAAC;AAC9C,OAAO,KAAK,iBAAiB,MAAM,sBAAsB,CAAC;AAE1D,MAAM,UAAU,GAAG,SAAS,CAAC;AAC7B,8DAA8D;AAC9D,mDAAmD;AACnD,iCAAiC;AACjC,MAAM,WAAW,GAAG,0BAA0B,CAAC;AAC/C,MAAM,EAAE,GAAG,gBAAgB,CAAC;AAC5B,MAAM,UAAU,GAAG,EAAE,CAAC;AACtB,MAAM,eAAe,GAAG,EAAE,CAAC;AAE3B,SAAS,aAAa,CAAC,QAAgB;IACtC,IAAI,CAAC,QAAQ,EAAE;QACd,OAAO,UAAU,CAAC;KAClB;IAED,IAAI,MAAM,GAAkB,eAAe,CAAC,QAAQ,CAAC,CAAC;IACtD,IAAI,MAAM,EAAE;QACX,OAAO,MAAM,CAAC;KACd;IAED,sDAAsD;IACtD,uFAAuF;IACvF,6CAA6C;IAC7C,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACpD,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAE1F,IAAI,qBAAqB,GAAG,CAAC,CAAC;IAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,EAAE,EAAE;QACpE,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,cAAc,EAAE;YACjC,MAAM,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC;SACpD;KACD;IACD,eAAe,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;IAEnC,OAAO,MAAM,CAAC;AACf,CAAC;AAyCD,MAAM,UAAU,qBAAqB,CAAC,IAAY;IACjD,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1E,CAAC;AAED,8CAA8C;AAC9C,MAAM,UAAU,SAAS,CAAC,kBAA0B;IACnD,MAAM,CAAC,GAAG,kBAAkB,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAElD,OAAO,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,WAAW,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,UAAU,IAAI,CAAC,KAAK,WAAW,IAAI,CAAC,KAAK,OAAO,CAAC;AACpJ,CAAC;AAED,uFAAuF;AACvF,qFAAqF;AACrF,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,IAAc;IAC5D,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC7B,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,GAAG,kBAAkB,OAAO,CAAC;QAEzC,OAAO,CAAC,IAAI,CAAC,WAAW,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,SAAS,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC,CAAC;KACpG;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,OAAO,OAAO;IAenB,YAAY,MAAgB,EAAE,OAAuB;QAN7C,4BAAuB,GAA4B,IAAI,GAAG,EAAsB,CAAC;QAOxF,IAAI,CAAC,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC9D,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,qBAAqB,OAAO,CAAC,cAAc,gBAAgB,MAAM,EAAE,CAAC,CAAC;SACrF;QAED,IAAI,OAAO,CAAC,MAAM,EAAE;YACnB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YACjD,IAAI,MAAM,YAAY,UAAU,EAAE;gBACjC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,QAAQ,EAAE,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;aACtF;SACD;IACF,CAAC;IAEO,uBAAuB,CAAC,IAAwB;QACvD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEM,8BAA8B,CAAC,IAAI;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;QAChE,MAAM,OAAO,GAAG,MAAM,CAAC,cAAc,CAAC;QACtC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE;YAC9C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SACrB;IACF,CAAC;IAEM,WAAW;QACjB,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC/D,uBAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,mBAAmB,EAAE,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;QACzG,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,CAAC;QAErC,qBAAqB;QACrB,wBAAwB;QACxB,IAAI;QAEJ,IAAI,IAAI,CAAC,aAAa,EAAE;YACvB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpC,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;SAC/B;IACF,CAAC;IAEO,cAAc,CAAC,MAAW;QACjC,oBAAoB;QACpB,MAAM,UAAU,GAAG,OAAO,MAAM,CAAC;QACjC,IAAI,UAAU,KAAK,QAAQ,EAAE;YAC5B,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;SAC5B;aAAM,IAAI,UAAU,KAAK,SAAS,EAAE;YACpC,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;SAC7B;aAAM,IAAI,UAAU,KAAK,QAAQ,EAAE;YACnC,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;SAC5B;QAED,mBAAmB;QACnB,OAAO,MAAM,CAAC;IACf,CAAC;IAEO,qBAAqB,CAAC,IAAwB;QACrD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjD,IAAI,CAAC,MAAM,EAAE;YACZ,IAAI,CAAC,MAAM,EAAE,CAAC;YAEd,OAAO;SACP;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE;YAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACnB;aAAM;YACN,yBAAyB;YACzB,4DAA4D;YAC5D,IAAI,CAAC,YAAY,EAAE,CAAC;SACpB;QAED,0CAA0C;IAC3C,CAAC;IAEM,IAAI,CAAC,MAAW;QACtB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjD,IAAI,IAAI,CAAC,sBAAsB,IAAI,MAAM,YAAY,UAAU,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,KAAK,gBAAgB,EAAE;YACpH,MAAM,CAAC,EAAE,CAAC,sBAAsB,EAAE,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;SACpE;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC;IAEO,MAAM,CAAC,MAAW;QACzB,IAAI,CAAC,WAAW,EAAE,CAAC;QAEnB,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAErC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE;YACrC,0CAA0C;YAC1C,IAAI,CAAC,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;YAClC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAExE,MAAM,WAAW,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAClD,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC/B,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACpE;aAAM,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE;YACxC,0CAA0C;YAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAClD,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;SACtD;IACF,CAAC;IAEM,MAAM;QACZ,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjD,IAAI,MAAM,YAAY,UAAU,EAAE;YACjC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBACxB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,QAAQ,EAAE,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;aACvF;YAED,IAAI,IAAI,CAAC,sBAAsB,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,KAAK,gBAAgB,EAAE;gBACpF,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAE,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;aACrE;SACD;QAED,IAAI,IAAI,CAAC,aAAa,EAAE;YACvB,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;SAC/B;QAED,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACjB,OAAO;SACP;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC;IAED,iEAAiE;IACzD,2BAA2B,CAAC,MAAc,EAAE,UAAyB;QAC5E,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,aAAa,GAAG,MAAM,CAAC;QAC3B,IAAI,oBAAoB,GAAG,KAAK,CAAC;QACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,gBAAgB,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,GAAG,gBAAgB,EAAE,CAAC,EAAE,EAAE;YAChF,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,QAAQ,KAAK,EAAE,CAAC,eAAe,EAAE;gBACpC,oBAAoB,GAAG,IAAI,CAAC;aAC5B;YAED,IAAI,QAAQ,KAAK,EAAE,CAAC,cAAc,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE;gBACjF,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC;gBACxE,IAAI,UAAU,EAAE;oBACf,aAAa,GAAG,UAAU,CAAC,cAAc,CAAC;iBAC1C;qBAAM;oBACN,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;oBACzC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;oBACxE,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;iBACvE;gBAED,oBAAoB,GAAG,IAAI,CAAC;aAC5B;YAED,IAAI,aAAa,EAAE;gBAClB,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;aAC7D;iBAAM;gBACN,MAAM;aACN;YAED,uFAAuF;YACvF,IAAI,CAAC,oBAAoB,IAAI,CAAC,GAAG,gBAAgB,GAAG,CAAC,EAAE;gBACtD,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;aACpE;YAED,oBAAoB,GAAG,KAAK,CAAC;SAC7B;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAEO,0BAA0B,CAAC,MAAuB,EAAE,cAA6B,EAAE,eAAwB;QAClH,MAAM,oBAAoB,GAAG,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;QAC5F,IAAI,IAAI,GAAG,eAAe,IAAI,EAAE,CAAC;QAEjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;YACtE,MAAM,QAAQ,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YAClD,IAAI,IAAI,GAAG,GAAG,QAAQ,CAAC;YACvB,MAAM,aAAa,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YACvD,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,aAAa,YAAY,UAAU,IAAI,aAAa,CAAC,WAAW,EAAE;gBAChH,6DAA6D;gBAC7D,oBAAoB,CAAC,aAAa,EAAE,GAAG,QAAQ,QAAQ,EAAE,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;gBAC7F,oBAAoB,CAAC,aAAa,EAAE,UAAU,CAAC,mBAAmB,EAAE,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;gBACxG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;aACtD;iBAAM,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,aAAa,YAAY,UAAU,EAAE;gBAC1F,oBAAoB,CAAC,aAAa,EAAE,UAAU,CAAC,mBAAmB,EAAE,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;gBACxG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;aACtD;SACD;IACF,CAAC;IAEO,0BAA0B;QACjC,6HAA6H;QAC7H,0GAA0G;QAC1G,8CAA8C;QAC9C,qGAAqG;QACrG,oDAAoD;QACpD,iIAAiI;QACjI,MAAM,qBAAqB,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC9E,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC;QAEpF,OAAO,SAAS,CAAC;IAClB,CAAC;IAEO,YAAY,CAAC,KAAU;QAC9B,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YAC1C,OAAO;SACP;QAED,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,4BAA4B,EAAE;SACjC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACnC,MAAM,YAAY,GAAG,EAAE,CAAC;YACxB,YAAY,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC;YACzC,YAAY,CAAC,EAAE,CAAC,mBAAmB,CAAC,GAAG,KAAK,CAAC;YAC7C,IAAI,kBAAkB,GAAG,EAAE,CAAC;YAC5B,IAAI,IAAI,CAAC,aAAa,EAAE;gBACvB,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;aACjD;iBAAM,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;gBAC9G,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;aACjD;YAED,IAAI,kBAAkB,KAAK,EAAE,EAAE;gBAC9B,YAAY,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;aACzC;YAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAC3D,IAAI,CAAC,2BAA2B,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;YAEjE,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;YACvF,IAAI,eAAe,YAAY,KAAK,EAAE;gBACrC,KAAK,CAAC,KAAK,CAAS,eAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aACjG;YAED,QAAQ,GAAG,eAAe,CAAC;SAC3B;QAED,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAEO,mBAAmB,CAAC,UAAkB,EAAE,aAAsB,EAAE,YAAiB;QACxF,IAAI,MAAM,GAAQ,EAAE,CAAC;QAErB,IAAI,CAAC,4BAA4B,EAAE;YAClC,IAAI,OAAO,CAAC;YACZ,MAAM,UAAU,GAAG,EAAE,CAAC;YACtB,IAAI;gBACH,IAAI,GAAG,CAAC;gBACR,IAAI;oBACH,GAAG,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;iBAClC;gBAAC,OAAO,CAAC,EAAE;oBACX,MAAM,GAAG,CAAC,CAAC;iBACX;gBAED,IAAI,GAAG,EAAE;oBACR,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,MAAM,CAAC;oBAC1E,MAAM,SAAS,GAAG,iBAAiB,CAAC,GAAG,EAAE,CAAC;oBAC1C,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;wBAC7B,IAAI,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;4BACpE,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;4BAChC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;yBACtB;qBACD;oBAED,+GAA+G;oBAC/G,IAAI,IAAI,CAAC,2BAA2B,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE;wBACtE,MAAM,GAAG,wBAAwB,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;qBACtG;yBAAM;wBACN,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;wBACzC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;wBACxE,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;qBACvE;iBACD;aACD;YAAC,OAAO,CAAC,EAAE;gBACX,MAAM,YAAY,GAAG,kCAAkC,GAAG,CAAC,CAAC,SAAS,GAAG,YAAY,GAAG,CAAC,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;gBAC3H,MAAM,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;aACjC;YAED,oBAAoB;YACpB,KAAK,IAAI,IAAI,IAAI,UAAU,EAAE;gBAC5B,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;aACrB;YACD,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;SACtB;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAEM,uBAAuB,CAAC,IAAwB;QACtD,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC1C,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC;QAC7C,IAAI,oBAAoB,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAClE,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,oBAAoB,GAAG,CAAC,CAAC,EAAE;YAC9B,WAAW,GAAG,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,oBAAoB,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7E,OAAO,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE;gBACrE,oBAAoB,IAAI,WAAW,CAAC,KAAK,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBACnG,WAAW,GAAG,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,oBAAoB,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC7E;SACD;QAED,IAAI,4BAA4B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC7D,IAAI,oBAAoB,GAAG,CAAC,CAAC,EAAE;gBAC9B,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC;gBAC1D,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC;gBACjC,IAAI,WAAW,GAAG,CAAC,EAAE;oBACpB,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;oBACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;wBACrC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;qBACxB;oBAED,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;iBACzB;qBAAM,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;oBAC7D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC9B;aACD;SACD;aAAM;YACN,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;YAC5F,IAAI,eAAe,YAAY,KAAK,EAAE;gBACrC,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aACxF;iBAAM;gBACN,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;aACnC;SACD;QAED,mGAAmG;QACnG,IAAI,oBAAoB,GAAG,CAAC,CAAC,IAAI,oBAAoB,GAAG,iBAAiB,GAAG,CAAC,EAAE;YAC9E,MAAM,qBAAqB,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC5E,IAAI,qBAAqB,IAAI,qBAAqB,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,EAAE;gBACtG,yGAAyG;gBACzG,uBAAuB;gBACvB,KAAK,IAAI,CAAC,GAAG,iBAAiB,GAAG,CAAC,EAAE,CAAC,GAAG,oBAAoB,EAAE,CAAC,EAAE,EAAE;oBAClE,MAAM,IAAI,GAAG,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACzD,IAAI,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;wBAC3C,uBAAuB,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,mBAAmB,EAAE,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;wBACpI,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;qBAC1C;iBACD;gBAED,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC;gBAC7D,+BAA+B;gBAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,CAAC;gBACjE,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAS,CAAC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;oBACzE,IAAI,CAAC,0BAA0B,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;iBAC/E;aACD;SACD;IACF,CAAC;IAEO,2BAA2B,CAAC,KAAa,EAAE,UAAkB,EAAE,UAAU,GAAG,EAAE;QACrF,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QAEzC,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,IAAI,kBAAqD,CAAC;QAC1D,IAAI,UAAU,CAAC;QACf,IAAI,YAAY,GAAG,UAAU,CAAC;QAC9B,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE;YAClD,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC;YAClC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;SACpC;QAED,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,YAAY,EAAE;YACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7C,+DAA+D;gBAC/D,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACzD,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBACzE,IAAI,kBAAkB,CAAC,IAAI,EAAE;oBAC5B,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;oBAC5D,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC;oBAC7F,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;iBACpC;qBAAM;oBACN,OAAO,GAAG,KAAK,CAAC;iBAChB;aACD;SACD;QAED,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE;YACjD,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC;YACxE,IAAI,UAAU,EAAE;gBACf,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC,cAAc,CAAC;gBACrD,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;aACnC;iBAAM;gBACN,OAAO,GAAG,KAAK,CAAC;aAChB;SACD;QACD,OAAO,OAAO,CAAC;IAChB,CAAC;IAEO,sBAAsB;QAC7B,IAAI,4BAA4B,EAAE;SACjC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACnC,MAAM,YAAY,GAAG,EAAE,CAAC;YACxB,YAAY,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/E,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;YAC/F,IAAI,eAAe,YAAY,KAAK,EAAE;gBACrC,KAAK,CAAC,KAAK,CAAS,eAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aACjG;iBAAM;gBACN,OAAO,eAAe,CAAC;aACvB;SACD;QAED,IAAI,IAAI,CAAC,aAAa,EAAE;YACvB,MAAM,qBAAqB,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAChE,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,KAAK,EAAE,CAAC,eAAe,EAAE;gBACvD,OAAO,qBAAqB,CAAC;aAC7B;iBAAM,IAAI,qBAAqB,YAAY,UAAU,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,KAAK,EAAE,EAAE;gBAC5H,OAAO,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;aAC9D;iBAAM,IAAI,qBAAqB,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,KAAK,EAAE,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,qBAAqB,EAAE;gBAC9J,OAAO,qBAAqB,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;aAC1D;iBAAM;gBACN,KAAK,CAAC,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,GAAG,mDAAmD,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,GAAG,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aACtM;SACD;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,YAAY;QAClB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IAEO,YAAY,CAAC,KAAU;QAC9B,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAO;SACP;QAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC7F,CAAC;IAEO,YAAY,CAAC,KAAU;QAC9B,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE;YACxD,OAAO;SACP;QAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAEO,aAAa,CAAC,MAAW,EAAE,QAAgB;QAClD,IAAI,CAAC,MAAM,EAAE;YACZ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACnC;QAED,IAAI,MAAgB,CAAC;QACrB,IAAI,QAAQ,KAAK,EAAE,CAAC,cAAc,EAAE;YACnC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;SACvB;QAED,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE;YAC/C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;YACvB,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/C,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC1C,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;aACvB;YAED,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBAClB,IAAI,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACjC,OAAO,UAAU,GAAG,CAAC,EAAE;oBACtB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;oBACvB,UAAU,EAAE,CAAC;iBACb;aACD;iBAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACjC,OAAO,MAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,EAAE;oBAC3C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;iBACvB;aACD;SACD;QAED,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACvC,CAAC;IAEO,cAAc,CAAC,GAAW,EAAE,UAAyB;QAC5D,MAAM,oBAAoB,GAAG,IAAI,CAAC,2BAA2B,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC/E,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,MAAM,WAAW,GAAG,oBAAoB,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;YACnF,MAAM,IAAI,GAAG,oBAAoB,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;YAE5E,OAAO;gBACN,QAAQ,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;gBACvD,QAAQ,EAAE,IAAI;aACd,CAAC;SACF;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,aAAa,CAAC,OAAqD,EAAE,KAAU;QACtF,IAAI,eAAe,CAAC;QACpB,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE;YAChC,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SACzC;QAED,IAAI,CAAC,eAAe,EAAE;YACrB,OAAO;SACP;QAED,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QAErB,IAAI;YACH,IAAI,gBAAgB,CAAC,OAAO,CAAC,QAAQ,EAAO,eAAe,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;gBACxF,8FAA8F;gBAC9F,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,eAAe,CAAC,cAAc,CAAC,CAAC;gBAC5E,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,eAAe,CAAC,cAAc,CAAC,CAAC;aAC5E;iBAAM,IAAI,eAAe,YAAY,UAAU,EAAE;gBACjD,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;aAC7C;iBAAM;gBACN,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;aAC1C;SACD;QAAC,OAAO,EAAE,EAAE;YACZ,KAAK,CAAC,KAAK,CAAC,uCAAuC,GAAG,OAAO,CAAC,QAAQ,GAAG,MAAM,GAAG,eAAe,GAAG,IAAI,GAAG,EAAE,EAAE,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAClK;QAED,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACvB,CAAC;CACD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/core/ui/core/bindable/index.ts"],"names":[],"mappings":"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"}

package/ui/switch/index.android.js

@@ -44,13 +44,15 @@ export class Switch extends SwitchBase {
     }
     setNativeBackgroundColor(value) {
         if (value instanceof Color) {
-            this.nativeViewProtected.getTrackDrawable().setColorFilter(value.android, android.graphics.PorterDuff.Mode.SRC_IN);
+            // todo: use https://developer.android.com/reference/androidx/core/graphics/BlendModeColorFilterCompat
+            this.nativeViewProtected.getTrackDrawable().setColorFilter(value.android, android.graphics.PorterDuff.Mode.SRC_OVER);
         }
         else {
             this.nativeViewProtected.getTrackDrawable().clearColorFilter();
         }
     }
     _onCheckedPropertyChanged(newValue) {
+        super._onCheckedPropertyChanged(newValue);
         if (this.offBackgroundColor) {
             if (!newValue) {
                 this.setNativeBackgroundColor(this.offBackgroundColor);
@@ -71,7 +73,8 @@ export class Switch extends SwitchBase {
     }
     [colorProperty.setNative](value) {
         if (value instanceof Color) {
-            this.nativeViewProtected.getThumbDrawable().setColorFilter(value.android, android.graphics.PorterDuff.Mode.SRC_IN);
+            // todo: use https://developer.android.com/reference/androidx/core/graphics/BlendModeColorFilterCompat
+            this.nativeViewProtected.getThumbDrawable().setColorFilter(value.android, android.graphics.PorterDuff.Mode.SRC_ATOP);
         }
         else {
             this.nativeViewProtected.getThumbDrawable().clearColorFilter();

package/ui/switch/index.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/switch/index.android.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/switch/index.android.ts"],"names":[],"mappings":"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"}

package/ui/switch/index.ios.d.ts

@@ -7,6 +7,8 @@ export declare class Switch extends SwitchBase {
     createNativeView(): UISwitch;
     initNativeView(): void;
     disposeNativeView(): void;
+    private setNativeBackgroundColor;
+    _onCheckedPropertyChanged(newValue: boolean): void;
     get ios(): UISwitch;
     onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void;
 }

package/ui/switch/index.ios.js

@@ -1,8 +1,9 @@
 import { SwitchBase, checkedProperty, offBackgroundColorProperty } from './switch-common';
 import { colorProperty, backgroundColorProperty, backgroundInternalProperty } from '../styling/style-properties';
 import { Color } from '../../color';
-import { layout } from '../../utils';
+import { iOSNativeHelper, layout } from '../../utils';
 export * from './switch-common';
+const majorVersion = iOSNativeHelper.MajorVersion;
 var SwitchChangeHandlerImpl = /** @class */ (function (_super) {
     __extends(SwitchChangeHandlerImpl, _super);
     function SwitchChangeHandlerImpl() {
@@ -44,6 +45,36 @@ export class Switch extends SwitchBase {
         this._handler = null;
         super.disposeNativeView();
     }
+    setNativeBackgroundColor(value) {
+        if (value) {
+            this.nativeViewProtected.onTintColor = value instanceof Color ? value.ios : value;
+            this.nativeViewProtected.tintColor = value instanceof Color ? value.ios : value;
+            this.nativeViewProtected.backgroundColor = value instanceof Color ? value.ios : value;
+            this.nativeViewProtected.layer.cornerRadius = this.nativeViewProtected.frame.size.height / 2;
+        }
+        else {
+            this.nativeViewProtected.onTintColor = null;
+            this.nativeViewProtected.tintColor = null;
+            this.nativeViewProtected.backgroundColor = null;
+            this.nativeViewProtected.layer.cornerRadius = 0;
+        }
+    }
+    _onCheckedPropertyChanged(newValue) {
+        // only add :checked pseudo handling on supported iOS versions
+        // ios <13 works but causes glitchy animations when toggling
+        // so we decided to keep the old behavior on older versions.
+        if (majorVersion >= 13) {
+            super._onCheckedPropertyChanged(newValue);
+            if (this.offBackgroundColor) {
+                if (!newValue) {
+                    this.setNativeBackgroundColor(this.offBackgroundColor);
+                }
+                else {
+                    this.setNativeBackgroundColor(this.backgroundColor instanceof Color ? this.backgroundColor : new Color(this.backgroundColor));
+                }
+            }
+        }
+    }
     // @ts-ignore
     get ios() {
         return this.nativeViewProtected;
@@ -67,13 +98,28 @@ export class Switch extends SwitchBase {
         return this.nativeViewProtected.thumbTintColor;
     }
     [colorProperty.setNative](value) {
-        this.nativeViewProtected.thumbTintColor = value instanceof Color ? value.ios : value;
+        var _a;
+        const color = value instanceof Color ? value.ios : value;
+        this.nativeViewProtected.thumbTintColor = color;
+        if (color && this.nativeViewProtected.subviews.count > 0) {
+            const alpha = new interop.Reference(1.0);
+            const res = color.getRedGreenBlueAlpha(null, null, null, alpha);
+            this.nativeViewProtected.subviews[0].alpha = (_a = (res && alpha.value)) !== null && _a !== void 0 ? _a : 1;
+        }
     }
     [backgroundColorProperty.getDefault]() {
         return this.nativeViewProtected.onTintColor;
     }
     [backgroundColorProperty.setNative](value) {
-        this.nativeViewProtected.onTintColor = value instanceof Color ? value.ios : value;
+        if (majorVersion >= 13) {
+            if (!this.offBackgroundColor || this.checked) {
+                this.setNativeBackgroundColor(value);
+            }
+        }
+        else {
+            // old behavior on unsupported iOS versions
+            this.nativeViewProtected.onTintColor = value instanceof Color ? value.ios : value;
+        }
     }
     [backgroundInternalProperty.getDefault]() {
         return null;
@@ -85,10 +131,18 @@ export class Switch extends SwitchBase {
         return this.nativeViewProtected.backgroundColor;
     }
     [offBackgroundColorProperty.setNative](value) {
-        const nativeValue = value instanceof Color ? value.ios : value;
-        this.nativeViewProtected.tintColor = nativeValue;
-        this.nativeViewProtected.backgroundColor = nativeValue;
-        this.nativeViewProtected.layer.cornerRadius = this.nativeViewProtected.frame.size.height / 2;
+        if (majorVersion >= 13) {
+            if (!this.checked) {
+                this.setNativeBackgroundColor(value);
+            }
+        }
+        else {
+            // old behavior on unsupported iOS versions...
+            const nativeValue = value instanceof Color ? value.ios : value;
+            this.nativeViewProtected.tintColor = nativeValue;
+            this.nativeViewProtected.backgroundColor = nativeValue;
+            this.nativeViewProtected.layer.cornerRadius = this.nativeViewProtected.frame.size.height / 2;
+        }
     }
 }
 //# sourceMappingURL=index.ios.js.map

package/ui/switch/index.ios.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/switch/index.ios.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/switch/index.ios.ts"],"names":[],"mappings":"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"}

package/ui/switch/switch-common.js

@@ -4,7 +4,12 @@ import { booleanConverter } from '../core/view-base';
 import { Property } from '../core/properties';
 let SwitchBase = class SwitchBase extends View {
     _onCheckedPropertyChanged(newValue) {
-        //
+        if (newValue) {
+            this.addPseudoClass('checked');
+        }
+        else {
+            this.deletePseudoClass('checked');
+        }
     }
 };
 SwitchBase.checkedChangeEvent = 'checkedChange';

package/ui/switch/switch-common.js.map

@@ -1 +1 @@
-{"version":3,"file":"switch-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/switch/switch-common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAI9C,IAAa,UAAU,GAAvB,MAAa,UAAW,SAAQ,IAAI;IAMnC,yBAAyB,CAAC,QAAiB;QAC1C,EAAE;IACH,CAAC;CACD,CAAA;AARc,6BAAkB,GAAG,eAAgB,CAAA;AADvC,UAAU;IADtB,OAAO,CAAC,QAAQ,CAAC;GACL,UAAU,CAStB;SATY,UAAU;AAWvB,UAAU,CAAC,SAAS,CAAC,iBAAiB,GAAG,MAAM,CAAC;AAEhD,SAAS,wBAAwB,CAAC,UAAsB,EAAE,QAAiB,EAAE,QAAiB;IAC7F,UAAU,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,QAAQ,CAAsB;IAChE,IAAI,EAAE,SAAS;IACf,YAAY,EAAE,KAAK;IACnB,cAAc,EAAE,gBAAgB;IAChC,YAAY,EAAE,wBAAwB;CACtC,CAAC,CAAC;AACH,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAErC,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,QAAQ,CAAoB;IACzE,IAAI,EAAE,oBAAoB;IAC1B,gBAAgB,EAAE,KAAK,CAAC,MAAM;IAC9B,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;CACnC,CAAC,CAAC;AACH,0BAA0B,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC"}
+{"version":3,"file":"switch-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/switch/switch-common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAI9C,IAAa,UAAU,GAAvB,MAAa,UAAW,SAAQ,IAAI;IAMnC,yBAAyB,CAAC,QAAiB;QAC1C,IAAI,QAAQ,EAAE;YACb,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;SAC/B;aAAM;YACN,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;SAClC;IACF,CAAC;CACD,CAAA;AAZc,6BAAkB,GAAG,eAAgB,CAAA;AADvC,UAAU;IADtB,OAAO,CAAC,QAAQ,CAAC;GACL,UAAU,CAatB;SAbY,UAAU;AAevB,UAAU,CAAC,SAAS,CAAC,iBAAiB,GAAG,MAAM,CAAC;AAEhD,SAAS,wBAAwB,CAAC,UAAsB,EAAE,QAAiB,EAAE,QAAiB;IAC7F,UAAU,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,QAAQ,CAAsB;IAChE,IAAI,EAAE,SAAS;IACf,YAAY,EAAE,KAAK;IACnB,cAAc,EAAE,gBAAgB;IAChC,YAAY,EAAE,wBAAwB;CACtC,CAAC,CAAC;AACH,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAErC,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,QAAQ,CAAoB;IACzE,IAAI,EAAE,oBAAoB;IAC1B,gBAAgB,EAAE,KAAK,CAAC,MAAM;IAC9B,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;CACnC,CAAC,CAAC;AACH,0BAA0B,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC"}