npm - @triniwiz/nativescript-masonkit - Versions diffs - 1.0.0-beta.108 → 1.0.0-beta.109 - Mend

@triniwiz/nativescript-masonkit 1.0.0-beta.108 → 1.0.0-beta.109

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.

Files changed (120) hide show

package/index.windows.d.ts CHANGED Viewed

@@ -10,10 +10,12 @@ export { Li } from './li';
 export { OrderedList as Ol, UnorderedList as Ul } from './list';
 export { TextArea } from './textarea';
 export * from './web';
+import './html-windows';
 export { setCssDiagnostics, getCssDiagnostics, clearCssDiagnostics, formatCssDiagnostics, cssDiagnosticsEnabled } from './diagnostics';
 export { setCssUnitContext, cssUnits } from './units';
 export { frameworkRegistry, readChildNodes, readLinkedList, type MasonFrameworkAdapter, type MasonNodeKind } from './framework-registry';
 export { hasTextRun } from './text-runs';
+export { registerAppFontsDirectory } from './fonts';
 export type BoxShadowRenderMode = 'auto' | 'render-node' | 'software';
 export declare function setBoxShadowRenderMode(_mode: BoxShadowRenderMode): void;
 export declare function setBoxShadowSoftwareRasterScale(_scale: number | null): void;

package/index.windows.js CHANGED Viewed

@@ -10,10 +10,12 @@ export { Li } from './li';
 export { OrderedList as Ol, UnorderedList as Ul } from './list';
 export { TextArea } from './textarea';
 export * from './web';
+import './html-windows';
 export { setCssDiagnostics, getCssDiagnostics, clearCssDiagnostics, formatCssDiagnostics, cssDiagnosticsEnabled } from './diagnostics';
 export { setCssUnitContext, cssUnits } from './units';
 export { frameworkRegistry, readChildNodes, readLinkedList } from './framework-registry';
 export { hasTextRun } from './text-runs';
+export { registerAppFontsDirectory } from './fonts';
 // Android-only shadow backend overrides; Windows always draws shadows through Composition.
 export function setBoxShadowRenderMode(_mode) { }
 export function setBoxShadowSoftwareRasterScale(_scale) { }

package/index.windows.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.windows.js","sourceRoot":"","sources":["../../../packages/nativescript-masonkit/index.windows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,WAAW,IAAI,EAAE,EAAE,aAAa,IAAI,EAAE,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,cAAc,OAAO,CAAC;~~AAEtB~~,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACvI,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,cAAc,EAAkD,MAAM,sBAAsB,CAAC;AACzI,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;~~AAIzC~~,2FAA2F;AAC3F,MAAM,UAAU,sBAAsB,CAAC,KAA0B,IAAS,CAAC;AAE3E,MAAM,UAAU,+BAA+B,CAAC,MAAqB,IAAS,CAAC"}
1	+ {"version":3,"file":"index.windows.js","sourceRoot":"","sources":["../../../packages/nativescript-masonkit/index.windows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,WAAW,IAAI,EAAE,EAAE,aAAa,IAAI,EAAE,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,cAAc,OAAO,CAAC;AACtB,OAAO,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACvI,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,cAAc,EAAkD,MAAM,sBAAsB,CAAC;AACzI,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAIpD,2FAA2F;AAC3F,MAAM,UAAU,sBAAsB,CAAC,KAA0B,IAAS,CAAC;AAE3E,MAAM,UAAU,+BAA+B,CAAC,MAAqB,IAAS,CAAC"}

package/input/common.d.ts CHANGED Viewed

@@ -5,7 +5,12 @@ export declare const defaultValueProperty: unique symbol;
 export declare const getValueProperty: unique symbol;
 export declare const setValueProperty: unique symbol;
 export declare const pendingValue: unique symbol;
+export declare const getCheckedProperty: unique symbol;
+export declare const setCheckedProperty: unique symbol;
+export declare const pendingChecked: unique symbol;
+declare const checkedState: unique symbol;
 export declare class InputBase extends ViewBase {
+    type: InputType;
     [pendingValue]: any;
     [defaultValueProperty](): any;
     [getValueProperty](): any;
@@ -14,7 +19,18 @@ export declare class InputBase extends ViewBase {
     set value(value: string);
     initNativeView(): void;
 }
+/** HTMLInputElement's state beyond `value`; `<textarea>` has none of it. */
+export declare class InputElementBase extends InputBase {
+    [pendingChecked]: boolean | null;
+    [checkedState]: boolean;
+    [getCheckedProperty](): boolean;
+    [setCheckedProperty](checked: boolean): void;
+    get checked(): boolean;
+    set checked(checked: boolean);
+    initNativeView(): void;
+}
 export declare const typeProperty: Property<InputBase, InputType>;
 export declare const placeholderProperty: Property<InputBase, string>;
 export declare const multipleProperty: Property<InputBase, boolean>;
 export declare const acceptProperty: Property<InputBase, string>;
+export {};

package/input/common.js CHANGED Viewed

@@ -1,4 +1,4 @@
-var _a;
+var _a, _b, _c;
 import { booleanConverter, Property } from '@nativescript/core';
 import { ViewBase } from '../common';
 import { native_ } from '../symbols';
@@ -6,6 +6,10 @@ export const defaultValueProperty = Symbol('input:default:value');
 export const getValueProperty = Symbol('input:get:value');
 export const setValueProperty = Symbol('input:set:value');
 export const pendingValue = Symbol('input:pending:value');
+export const getCheckedProperty = Symbol('input:get:checked');
+export const setCheckedProperty = Symbol('input:set:checked');
+export const pendingChecked = Symbol('input:pending:checked');
+const checkedState = Symbol('input:checked');
 export class InputBase extends ViewBase {
     constructor() {
         super(...arguments);
@@ -29,12 +33,14 @@ export class InputBase extends ViewBase {
         }
         return this[getValueProperty]();
     }
+    // As on the web, value is always a string, and null clears it.
     set value(value) {
+        const text = value == null ? '' : String(value);
         if (!this[native_]) {
-            this[pendingValue] = value;
+            this[pendingValue] = text;
             return;
         }
-        this[setValueProperty](value);
+        this[setValueProperty](text);
     }
     initNativeView() {
         super.initNativeView();
@@ -44,6 +50,42 @@ export class InputBase extends ViewBase {
         }
     }
 }
+/** HTMLInputElement's state beyond `value`; `<textarea>` has none of it. */
+export class InputElementBase extends InputBase {
+    constructor() {
+        super(...arguments);
+        this[_b] = null;
+        this[_c] = false;
+    }
+    [(_b = pendingChecked, _c = checkedState, getCheckedProperty)]() {
+        return this[checkedState];
+    }
+    //@ts-ignore
+    [setCheckedProperty](checked) {
+        this[checkedState] = checked;
+    }
+    get checked() {
+        if (!this[native_]) {
+            return this[pendingChecked] ?? false;
+        }
+        return this[getCheckedProperty]();
+    }
+    set checked(checked) {
+        const value = !!checked;
+        if (!this[native_]) {
+            this[pendingChecked] = value;
+            return;
+        }
+        this[setCheckedProperty](value);
+    }
+    initNativeView() {
+        super.initNativeView();
+        if (this[pendingChecked] !== null) {
+            this[setCheckedProperty](this[pendingChecked]);
+            this[pendingChecked] = null;
+        }
+    }
+}
 export const typeProperty = new Property({
     name: 'type',
     defaultValue: 'text',

package/input/common.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/input/common.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAClE,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;~~AAE1D~~,MAAM,OAAO,SAAU,SAAQ,QAAQ;IAAvC;;~~QACE~~,QAAc,GAAG,IAAI,CAAC;~~IAwCxB~~,CAAC;~~IAtCC~~,OAFC,YAAY,EAEZ,oBAAoB,EAAC;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,CAAC,gBAAgB,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,YAAY;IACZ,CAAC,gBAAgB,CAAC,CAAC,KAAa,IAAG,CAAC;IAEpC,IAAI,KAAK;QACP,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACnB,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC;gBAChC,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC;YAC5B,CAAC;YACD,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAChD,OAAO,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3D,CAAC;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;IAClC,CAAC;IAED,IAAI,KAAK,CAAC,KAAa;QACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,YAAY,CAAC,GAAG,~~KAAK~~,CAAC;~~YAC3B~~,OAAO;QACT,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,CAAC,~~KAAK~~,CAAC,CAAC;~~IAChC~~,CAAC;IAED,cAAc;QACZ,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC;YAChC,IAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;YAC3C,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;QAC5B,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAuB;IAC7D,IAAI,EAAE,MAAM;IACZ,YAAY,EAAE,MAAM;CACrB,CAAC,CAAC;AAEH,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAEjC,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,QAAQ,CAAoB;IACjE,IAAI,EAAE,aAAa;IACnB,YAAY,EAAE,EAAE;CACjB,CAAC,CAAC;AAEH,mBAAmB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAExC,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,QAAQ,CAAqB;IAC/D,IAAI,EAAE,UAAU;IAChB,YAAY,EAAE,KAAK;IACnB,cAAc,EAAE,gBAAgB;CACjC,CAAC,CAAC;AAEH,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAErC,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,QAAQ,CAAoB;IAC5D,IAAI,EAAE,QAAQ;IACd,YAAY,EAAE,KAAK;CACpB,CAAC,CAAC;AAEH,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC"}
1	+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/input/common.ts"],"names":[],"mappings":"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"}

package/input/index.android.d.ts CHANGED Viewed

@@ -1,19 +1,24 @@
-import { acceptProperty, defaultValueProperty, getValueProperty, InputBase, multipleProperty, setValueProperty, placeholderProperty, typeProperty } from './common';
+import { Color } from '@nativescript/core';
+import { placeholderColorProperty } from '@nativescript/core/ui/editable-text-base';
+import { acceptProperty, defaultValueProperty, getCheckedProperty, getValueProperty, InputElementBase, multipleProperty, setCheckedProperty, setValueProperty, placeholderProperty, typeProperty } from './common';
 import { style_ } from '../symbols';
 import { InputType } from '..';
-export declare class Input extends InputBase {
+export declare class Input extends InputElementBase {
     [multipleProperty.setNative]: (value: any) => void;
     [acceptProperty.setNative]: (value: string) => void;
     [typeProperty.setNative]: (value: InputType) => void;
     [placeholderProperty.setNative]: (value: string) => void;
+    [placeholderColorProperty.getDefault]: () => globalAndroid.content.res.ColorStateList;
+    [placeholderColorProperty.setNative]: (value: Color | android.content.res.ColorStateList) => void;
     [style_]: any;
     _inBatch: boolean;
     constructor();
-    private _type;
     private getType;
     [defaultValueProperty](): string;
     [getValueProperty](): string;
     [setValueProperty](value: any): void;
+    [getCheckedProperty](): boolean;
+    [setCheckedProperty](checked: boolean): void;
     set valueAsNumber(value: number);
     get valueAsNumber(): number;
     set valueAsDate(value: Date | null);

package/input/index.android.js CHANGED Viewed

@@ -1,17 +1,17 @@
-import { CSSType, Utils } from '@nativescript/core';
-import { acceptProperty, defaultValueProperty, getValueProperty, InputBase, multipleProperty, setValueProperty, placeholderProperty, typeProperty } from './common';
+import { Color, CSSType, Utils } from '@nativescript/core';
+import { placeholderColorProperty } from '@nativescript/core/ui/editable-text-base';
+import { acceptProperty, defaultValueProperty, getCheckedProperty, getValueProperty, InputElementBase, multipleProperty, setCheckedProperty, setValueProperty, placeholderProperty, typeProperty } from './common';
 import { Tree } from '../tree';
 import { Style } from '../style';
 import { style_, isMasonView_, native_ } from '../symbols';
-let Input = class Input extends InputBase {
+let Input = class Input extends InputElementBase {
     constructor() {
         super();
         this._inBatch = false;
-        this._type = 'text';
         this[isMasonView_] = true;
     }
     getType() {
-        switch (this._type) {
+        switch (this.type) {
             case 'text':
                 return org.nativescript.mason.masonkit.Input.Type.Text;
             case 'button':
@@ -75,8 +75,13 @@ let Input = class Input extends InputBase {
     [setValueProperty](value) {
         this._view.setValue(value);
     }
+    [getCheckedProperty]() {
+        return this._view.getChecked();
+    }
+    [setCheckedProperty](checked) {
+        this._view.setChecked(checked);
+    }
     [typeProperty.setNative](value) {
-        this._type = value;
         if (this._view) {
             this._view.setType(this.getType());
         }
@@ -86,6 +91,18 @@ let Input = class Input extends InputBase {
             this._view.setPlaceholder(value);
         }
     }
+    // Core's placeholder-color (also what ::placeholder { color } compiles to), as on TextField.
+    [placeholderColorProperty.getDefault]() {
+        return this._view.getPlaceholderTextColors();
+    }
+    [placeholderColorProperty.setNative](value) {
+        if (value instanceof Color) {
+            this._view.setPlaceholderTextColor(value.android);
+        }
+        else {
+            this._view.setPlaceholderTextColor(value);
+        }
+    }
     set valueAsNumber(value) {
         if (this._view) {
             this._view.setValueAsNumber(value);
@@ -105,7 +122,7 @@ let Input = class Input extends InputBase {
     get _view() {
         if (!this[native_]) {
             const context = Utils.android.getCurrentActivity() || Utils.android.getApplicationContext();
-            const view = Tree.instance.createInputView(context, this._type);
+            const view = Tree.instance.createInputView(context, this.type);
             this[native_] = view;
             return view;
         }

package/input/index.android.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/input/index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;~~AACpD~~,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,~~SAAS~~,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;~~AACpK~~,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAIpD,IAAM,KAAK,GAAX,MAAM,KAAM,SAAQ,~~SAAS~~;~~IAGlC~~;QACE,KAAK,EAAE,CAAC;QAFV,aAAQ,GAAG,KAAK,CAAC;~~QAMT~~,~~UAAK,GAAc,MAAM,CAAC;QAHhC,~~IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;IAC5B,CAAC;~~IAIO~~,OAAO;QACb,QAAQ,IAAI,CAAC,~~KAAK~~,EAAE,CAAC;~~YACnB~~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~~YAAY~~,CAAC,~~SAAS~~,CAAC,CAAC,~~KAAgB~~;~~QACvC~~,IAAI,CAAC,KAAK,~~GAAG~~,~~KAAK~~,CAAC;~~QACnB~~,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,KAAa;QAC3C,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,IAAI,aAAa,CAAC,KAAa;QAC7B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;IAC1D,CAAC;IAED,IAAI,WAAW,CAAC,KAAkB;QAChC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAChF,CAAC;IAED,IAAI,KAAK;QACP,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACnB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;YAC5F,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,~~KAAK~~,CAAU,CAAC;~~YACzE~~,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAmD,CAAC;IACzE,CAAC;IAED,IAAI,YAAY;QACd,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAa,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,6DAA6D;IAC7D,aAAa;IACb,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAA8C,CAAC;IAC7D,CAAC;CACF,CAAA;~~AA5IY~~,KAAK;IADjB,OAAO,CAAC,OAAO,CAAC;;GACJ,KAAK,~~CA4IjB~~"}
1	+ {"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/input/index.android.ts"],"names":[],"mappings":"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"}

package/input/index.ios.d.ts CHANGED Viewed

@@ -1,20 +1,24 @@
-import { acceptProperty, defaultValueProperty, getValueProperty, InputBase, multipleProperty, setValueProperty } from './common';
+import { Color } from '@nativescript/core';
+import { placeholderColorProperty } from '@nativescript/core/ui/editable-text-base';
+import { acceptProperty, defaultValueProperty, getCheckedProperty, getValueProperty, InputElementBase, multipleProperty, setCheckedProperty, setValueProperty } from './common';
 import { style_ } from '../symbols';
 import { placeholderProperty, typeProperty } from './common';
 import { InputType } from '..';
 import { Style } from '../style';
-export declare class Input extends InputBase {
+export declare class Input extends InputElementBase {
     [multipleProperty.setNative]: (value: any) => void;
     [typeProperty.setNative]: (value: InputType) => void;
     [placeholderProperty.setNative]: (value: string) => void;
+    [placeholderColorProperty.setNative]: (value: Color | UIColor) => void;
     [acceptProperty.setNative]: (value: string) => void;
     [style_]: any;
-    private _type;
     private getType;
     constructor();
     [defaultValueProperty](): string;
     [getValueProperty](): string;
     [setValueProperty](value: any): void;
+    [getCheckedProperty](): boolean;
+    [setCheckedProperty](checked: boolean): void;
     set valueAsNumber(value: number);
     get valueAsNumber(): number;
     set valueAsDate(value: Date | null);

package/input/index.ios.js CHANGED Viewed

@@ -1,12 +1,13 @@
-import { CSSType, Utils } from '@nativescript/core';
-import { acceptProperty, defaultValueProperty, getValueProperty, InputBase, multipleProperty, setValueProperty } from './common';
+import { Color, CSSType, Utils } from '@nativescript/core';
+import { placeholderColorProperty } from '@nativescript/core/ui/editable-text-base';
+import { acceptProperty, defaultValueProperty, getCheckedProperty, getValueProperty, InputElementBase, multipleProperty, setCheckedProperty, setValueProperty } from './common';
 import { style_, isMasonView_, native_ } from '../symbols';
 import { Tree } from '../tree';
 import { placeholderProperty, typeProperty } from './common';
 import { Style } from '../style';
-let Input = class Input extends InputBase {
+let Input = class Input extends InputElementBase {
     getType() {
-        switch (this._type) {
+        switch (this.type) {
             case 'text':
                 return 0 /* MasonInputType.Text */;
             case 'button':
@@ -52,7 +53,6 @@ let Input = class Input extends InputBase {
     }
     constructor() {
         super();
-        this._type = 'text';
         this._inBatch = false;
         this[isMasonView_] = true;
     }
@@ -70,6 +70,12 @@ let Input = class Input extends InputBase {
     [setValueProperty](value) {
         this._view.value = value;
     }
+    [getCheckedProperty]() {
+        return this._view.checked;
+    }
+    [setCheckedProperty](checked) {
+        this._view.checked = checked;
+    }
     set valueAsNumber(value) {
         if (this._view) {
             this._view.valueAsNumber = value;
@@ -87,7 +93,6 @@ let Input = class Input extends InputBase {
         return this._view ? this._view.valueAsDate : null;
     }
     [typeProperty.setNative](value) {
-        this._type = value;
         if (this._view) {
             this._view.type = this.getType();
         }
@@ -97,6 +102,12 @@ let Input = class Input extends InputBase {
             this._view.placeholder = value;
         }
     }
+    // Core's placeholder-color (also what ::placeholder { color } compiles to), as on TextField.
+    [placeholderColorProperty.setNative](value) {
+        if (this._view) {
+            this._view.placeholderColor = value instanceof Color ? value.ios : value;
+        }
+    }
     [acceptProperty.setNative](value) {
         if (this._view) {
             this._view.accept = value;
@@ -104,7 +115,7 @@ let Input = class Input extends InputBase {
     }
     get _view() {
         if (!this[native_]) {
-            const view = Tree.instance.createInputView(null, this._type);
+            const view = Tree.instance.createInputView(null, this.type);
             this[native_] = view;
             return view;
         }

package/input/index.ios.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/input/index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;~~AACpD~~,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,~~SAAS~~,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;~~AACjI~~,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7D,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAG1B,IAAM,KAAK,GAAX,MAAM,KAAM,SAAQ,~~SAAS~~;~~IAK1B~~,OAAO;QACb,QAAQ,IAAI,CAAC,~~KAAK~~,EAAE,CAAC;~~YACnB~~,KAAK,MAAM;gBACT,mCAA2B;YAC7B,KAAK,QAAQ;gBACX,qCAA6B;YAC/B,KAAK,UAAU;gBACb,uCAA+B;YACjC,KAAK,OAAO;gBACV,oCAA4B;YAC9B,KAAK,UAAU;gBACb,uCAA+B;YACjC,KAAK,MAAM;gBACT,mCAA2B;YAC7B,KAAK,OAAO;gBACV,oCAA4B;YAC9B,KAAK,QAAQ;gBACX,qCAA6B;YAC/B,KAAK,OAAO;gBACV,oCAA4B;YAC9B,KAAK,KAAK;gBACR,kCAA0B;YAC5B,KAAK,KAAK;gBACR,mCAA0B;YAC5B,KAAK,QAAQ;gBACX,sCAA6B;YAC/B,KAAK,MAAM;gBACT,oCAA2B;YAC7B,KAAK,gBAAgB;gBACnB,6CAAoC;YACtC,KAAK,OAAO;gBACV,qCAA4B;YAC9B,KAAK,MAAM;gBACT,oCAA2B;YAC7B,KAAK,OAAO;gBACV,qCAA4B;YAC9B,KAAK,MAAM;gBACT,oCAA2B;YAC7B,KAAK,QAAQ;gBACX,sCAA6B;YAC/B,KAAK,OAAO;gBACV,qCAA4B;QAChC,CAAC;QACD,mCAA2B;IAC7B,CAAC;IAED;QACE,KAAK,EAAE,CAAC;~~QAjDF~~,~~UAAK,GAAc,MAAM,CAAC;QA8HlC,~~aAAQ,GAAG,KAAK,CAAC;~~QA5Ef~~,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,KAAK;QAChC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,CAAC,oBAAoB,CAAC;QACpB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,CAAC,gBAAgB,CAAC;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAC1B,CAAC;IAED,CAAC,gBAAgB,CAAC,CAAC,KAAK;QACtB,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,IAAI,aAAa,CAAC,KAAa;QAC7B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC;QACnC,CAAC;IACH,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC;IACrD,CAAC;IAED,IAAI,WAAW,CAAC,KAAkB;QAChC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;QACjC,CAAC;IACH,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IACpD,CAAC;IAED,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,KAAgB;QACvC,IAAI,~~CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,~~IAAI,~~IAAI,~~CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QACnC,CAAC;IACH,CAAC;IAED,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,KAAa;QAC3C,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;QACjC,CAAC;IACH,CAAC;IAED,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,KAAa;QACtC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,IAAI,KAAK;QACP,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACnB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,~~KAAK~~,CAAU,CAAC;~~YACtE~~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~~AAvMY~~,KAAK;IADjB,OAAO,CAAC,OAAO,CAAC;;GACJ,KAAK,~~CAuMjB~~"}
1	+ {"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/input/index.ios.ts"],"names":[],"mappings":"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"}

package/input/index.windows.d.ts CHANGED Viewed

@@ -1,19 +1,31 @@
-import { acceptProperty, defaultValueProperty, getValueProperty, InputBase, multipleProperty, setValueProperty, placeholderProperty, typeProperty } from './common';
+import { Color, fontInternalProperty } from '@nativescript/core';
+import { placeholderColorProperty } from '@nativescript/core/ui/editable-text-base/editable-text-base-common';
+import { acceptProperty, defaultValueProperty, getCheckedProperty, getValueProperty, InputElementBase, multipleProperty, setCheckedProperty, setValueProperty, placeholderProperty, typeProperty } from './common';
 import { style_ } from '../symbols';
 import { InputType } from '..';
 import { Style } from '../style';
-export declare class Input extends InputBase {
+export declare class Input extends InputElementBase {
     [typeProperty.setNative]: (value: InputType) => void;
+    [placeholderColorProperty.setNative]: (value: Color) => void;
     [placeholderProperty.setNative]: (value: any) => void;
     [multipleProperty.setNative]: (value: any) => void;
     [acceptProperty.setNative]: (value: any) => void;
+    [fontInternalProperty.setNative]: (value: any) => void;
     [style_]: any;
     constructor();
     get _view(): NativeScript.Mason.Input;
     get windows(): NativeScript.Mason.Input;
     get _styleHelper(): Style;
     createNativeView(): NativeScript.Mason.Input;
+    private _uaKind;
+    private applyUaStyle;
+    [getCheckedProperty](): boolean;
+    [setCheckedProperty](checked: boolean): void;
     [defaultValueProperty](): string;
     [getValueProperty](): string;
     [setValueProperty](value: any): void;
+    get valueAsNumber(): number;
+    set valueAsNumber(value: number);
+    get valueAsDate(): Date | null;
+    set valueAsDate(value: Date | null);
 }

package/input/index.windows.js CHANGED Viewed

@@ -1,5 +1,7 @@
-import { CSSType } from '@nativescript/core';
-import { acceptProperty, defaultValueProperty, getValueProperty, InputBase, multipleProperty, setValueProperty, placeholderProperty, typeProperty } from './common';
+import { Color, CSSType, fontInternalProperty } from '@nativescript/core';
+import { placeholderColorProperty } from '@nativescript/core/ui/editable-text-base/editable-text-base-common';
+import { ViewBase, windowsFontSource } from '../common';
+import { acceptProperty, defaultValueProperty, getCheckedProperty, getValueProperty, InputElementBase, multipleProperty, setCheckedProperty, setValueProperty, placeholderProperty, typeProperty } from './common';
 import { style_, isMasonView_, native_ } from '../symbols';
 import { Tree } from '../tree';
 import { Style } from '../style';
@@ -33,18 +35,79 @@ function typeToInt(t) {
             return 12;
         case 'submit':
             return 13;
+        case 'search':
+            return 14;
+        case 'time':
+            return 15;
+        case 'datetime-local':
+            return 16;
+        case 'month':
+            return 17;
+        case 'week':
+            return 18;
+        case 'reset':
+            return 19;
         default:
             return 0;
     }
 }
-let Input = class Input extends InputBase {
+function uaKind(type) {
+    switch (type) {
+        case 'text':
+        case 'email':
+        case 'password':
+        case 'tel':
+        case 'url':
+        case 'number':
+        case 'search':
+        case 'datetime-local':
+        case 'month':
+        case 'week':
+            return 'field';
+        case 'button':
+        case 'submit':
+        case 'reset':
+            return 'button';
+        case 'color':
+            return 'swatch';
+        default:
+            return 'bare';
+    }
+}
+function ua(top, right, border, radius, background, align) {
+    return {
+        'padding-top': top,
+        'padding-right': right,
+        'padding-bottom': top,
+        'padding-left': right,
+        border,
+        'border-top-left-radius': radius,
+        'border-top-right-radius': radius,
+        'border-bottom-right-radius': radius,
+        'border-bottom-left-radius': radius,
+        'background-color': background,
+        'text-align': align,
+    };
+}
+const UA_STYLES = {
+    field: ua(1, 2, '1 solid #767676', 4, 'transparent', 'left'),
+    button: ua(1, 6, '1 solid #767676', 4, '#efefef', 'center'),
+    swatch: ua(5, 4, '1 solid #767676', 4, '#efefef', 'center'),
+    bare: ua(0, 0, 'none', 0, 'transparent', 'left'),
+};
+const PREFLIGHT_RESET = /^padding-/;
+let Input = class Input extends InputElementBase {
     constructor() {
         super();
+        this._uaKind = null;
         this[isMasonView_] = true;
+        this.applyUaStyle('text');
     }
     get _view() {
         if (!this[native_]) {
-            this[native_] = Tree.instance.createInputView();
+            const view = Tree.instance.createInputView();
+            view.Type = typeToInt(this.type);
+            this[native_] = view;
         }
         return this[native_];
     }
@@ -61,10 +124,36 @@ let Input = class Input extends InputBase {
     createNativeView() {
         return this._view;
     }
+    applyUaStyle(type) {
+        const kind = uaKind(type);
+        if (kind === this._uaKind)
+            return;
+        this._uaKind = kind;
+        const style = this.style;
+        const declarations = UA_STYLES[kind];
+        for (const property in declarations) {
+            if (ViewBase.preflight && PREFLIGHT_RESET.test(property))
+                continue;
+            style[`css:${property}`] = declarations[property];
+        }
+    }
     [typeProperty.setNative](value) {
+        this.applyUaStyle(value);
         if (this._view)
             this._view.Type = typeToInt(value);
     }
+    [getCheckedProperty]() {
+        return this._view.Checked;
+    }
+    [setCheckedProperty](checked) {
+        this._view.Checked = checked;
+    }
+    [placeholderColorProperty.setNative](value) {
+        if (value instanceof Color)
+            this._view.SetPlaceholderColor(value.argb >>> 0);
+        else
+            this._view.ClearPlaceholderColor();
+    }
     [placeholderProperty.setNative](value) {
         if (this._view)
             this._view.Placeholder = value ?? '';
@@ -87,6 +176,56 @@ let Input = class Input extends InputBase {
         if (this._view)
             this._view.Value = value ?? '';
     }
+    [fontInternalProperty.setNative](value) {
+        this._view?.SetFontFamily(windowsFontSource(value));
+    }
+    get valueAsNumber() {
+        const value = this.value ?? '';
+        switch (this.type) {
+            case 'number':
+            case 'range':
+                return value === '' ? NaN : Number(value);
+            case 'date':
+                return value ? Date.parse(`${value}T00:00:00Z`) : NaN;
+            case 'time': {
+                const m = /^(\d{2}):(\d{2})/.exec(value);
+                return m ? (Number(m[1]) * 60 + Number(m[2])) * 60000 : NaN;
+            }
+            default:
+                return NaN;
+        }
+    }
+    set valueAsNumber(value) {
+        const valid = typeof value === 'number' && Number.isFinite(value);
+        switch (this.type) {
+            case 'number':
+            case 'range':
+                this.value = valid ? String(value) : '';
+                break;
+            case 'date':
+                this.value = valid ? new Date(value).toISOString().slice(0, 10) : '';
+                break;
+            case 'time': {
+                if (!valid) {
+                    this.value = '';
+                    break;
+                }
+                const minutes = Math.floor(value / 60000) % 1440;
+                this.value = `${String(Math.floor(minutes / 60)).padStart(2, '0')}:${String(minutes % 60).padStart(2, '0')}`;
+                break;
+            }
+        }
+    }
+    get valueAsDate() {
+        const type = this.type;
+        if (type !== 'date' && type !== 'time')
+            return null;
+        const n = this.valueAsNumber;
+        return Number.isNaN(n) ? null : new Date(n);
+    }
+    set valueAsDate(value) {
+        this.valueAsNumber = value ? value.getTime() : NaN;
+    }
 };
 Input = __decorate([
     CSSType('input'),