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

package/fonts.js

@@ -21,4 +21,69 @@ export function registerAppFontsDirectory() {
         registered = false;
     }
 }
+const GENERIC_FAMILIES = new Set(['serif', 'sans-serif', 'monospace', 'cursive', 'fantasy', 'system-ui', 'ui-serif', 'ui-sans-serif', 'ui-monospace', 'ui-rounded', 'emoji', 'math']);
+/** Splits a CSS `font-family` list into family names, without their quotes. */
+export function parseFontFamilyList(value) {
+    const families = [];
+    let current = '';
+    let quote = null;
+    for (const ch of value) {
+        if (quote) {
+            if (ch === quote)
+                quote = null;
+            else
+                current += ch;
+        }
+        else if (ch === '"' || ch === "'") {
+            quote = ch;
+        }
+        else if (ch === ',') {
+            families.push(current);
+            current = '';
+        }
+        else {
+            current += ch;
+        }
+    }
+    families.push(current);
+    return families.map((family) => family.trim().replace(/\s+/g, ' ')).filter(Boolean);
+}
+const availableFamilies = new Set();
+/** Whether a named family can be drawn here: installed, registered from the app's fonts folder, or bundled. */
+export function isFontFamilyAvailable(family) {
+    const key = family.toLowerCase();
+    if (availableFamilies.has(key))
+        return true;
+    let found = true;
+    if (__APPLE__) {
+        found = false;
+        const names = UIFont.familyNames;
+        for (let i = 0; i < names.count; i++) {
+            if (names.objectAtIndex(i).toLowerCase() === key) {
+                found = true;
+                break;
+            }
+        }
+    }
+    else if (__ANDROID__) {
+        registerAppFontsDirectory();
+        found = org.nativescript.mason.masonkit.AppFonts.resolve(family) != null || !android.graphics.Typeface.create(family, android.graphics.Typeface.NORMAL).equals(android.graphics.Typeface.DEFAULT);
+    }
+    // Only hits are cached: a family can be registered later, a font file can't disappear.
+    if (found)
+        availableFamilies.add(key);
+    return found;
+}
+/**
+ * The single family the natives should use for a CSS `font-family` value: the first
+ * family in the list that is generic or available, as CSS font matching picks it.
+ * Quotes are removed, so `'Mukta Mahee'` and `Mukta Mahee` name the same family.
+ * Falls back to the first family named when none is available.
+ */
+export function pickFontFamily(value, isAvailable = isFontFamilyAvailable) {
+    const families = parseFontFamilyList(value);
+    if (families.length === 0)
+        return value;
+    return families.find((family) => GENERIC_FAMILIES.has(family.toLowerCase()) || isAvailable(family)) ?? families[0];
+}
 //# sourceMappingURL=fonts.js.map

package/fonts.js.map

@@ -1 +1 @@
-{"version":3,"file":"fonts.js","sourceRoot":"","sources":["../../../packages/nativescript-masonkit/fonts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAExD,IAAI,UAAU,GAAG,KAAK,CAAC;AAEvB;;;;;;;GAOG;AACH,MAAM,UAAU,yBAAyB;IACvC,IAAI,CAAC,WAAW,IAAI,UAAU,EAAE,CAAC;QAC/B,OAAO;IACT,CAAC;IACD,UAAU,GAAG,IAAI,CAAC;IAClB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/D,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAClE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,UAAU,GAAG,KAAK,CAAC;IACrB,CAAC;AACH,CAAC"}
+{"version":3,"file":"fonts.js","sourceRoot":"","sources":["../../../packages/nativescript-masonkit/fonts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAExD,IAAI,UAAU,GAAG,KAAK,CAAC;AAEvB;;;;;;;GAOG;AACH,MAAM,UAAU,yBAAyB;IACvC,IAAI,CAAC,WAAW,IAAI,UAAU,EAAE,CAAC;QAC/B,OAAO;IACT,CAAC;IACD,UAAU,GAAG,IAAI,CAAC;IAClB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/D,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAClE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,UAAU,GAAG,KAAK,CAAC;IACrB,CAAC;AACH,CAAC;AAED,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;AAEtL,+EAA+E;AAC/E,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC/C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,KAAK,GAAkB,IAAI,CAAC;IAChC,KAAK,MAAM,EAAE,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,EAAE,KAAK,KAAK;gBAAE,KAAK,GAAG,IAAI,CAAC;;gBAC1B,OAAO,IAAI,EAAE,CAAC;QACrB,CAAC;aAAM,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YACpC,KAAK,GAAG,EAAE,CAAC;QACb,CAAC;aAAM,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YACtB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvB,OAAO,GAAG,EAAE,CAAC;QACf,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;IACH,CAAC;IACD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACtF,CAAC;AAED,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;AAE5C,+GAA+G;AAC/G,MAAM,UAAU,qBAAqB,CAAC,MAAc;IAClD,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;IACjC,IAAI,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAC5C,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,IAAI,SAAS,EAAE,CAAC;QACd,KAAK,GAAG,KAAK,CAAC;QACd,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC;QACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,EAAE,CAAC;gBACjD,KAAK,GAAG,IAAI,CAAC;gBACb,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;SAAM,IAAI,WAAW,EAAE,CAAC;QACvB,yBAAyB,EAAE,CAAC;QAC5B,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACpM,CAAC;IACD,uFAAuF;IACvF,IAAI,KAAK;QAAE,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACtC,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,KAAa,EAAE,cAA2C,qBAAqB;IAC5G,MAAM,QAAQ,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC5C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACxC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC;AACrH,CAAC"}

package/index.d.ts

@@ -322,7 +322,8 @@ class VBase extends ViewBase implements IViewBase {
 
   /**
    * Returns the top-most Mason/NativeScript element at a point in this view's
-   * visible local coordinate space.
+   * visible local coordinate space. `x` and `y` are CSS pixels (dips) on every
+   * platform, the unit touch events report.
    */
   elementFromPoint(x: number, y: number): ViewBase | null;
 }

package/nativescript.webpack.js

@@ -0,0 +1,30 @@
+/**
+ * Loads MasonKit before the app's own entry module.
+ *
+ * @nativescript/webpack's app-css-loader puts `import "./app.css"` at the very top
+ * of the app entry, and core parses a stylesheet - splitting every shorthand
+ * (`border-radius`, `margin`, `padding`, `background`, ...) into longhands - as
+ * soon as it is imported. MasonKit swaps in its own shorthand converters when its
+ * properties register, which used to happen only when the app entry imported
+ * MasonKit, i.e. after app.css. So app.css was split by core's converters instead:
+ * `border-radius: 0 4px 0 4px` lost its 0 corners on a button, `padding: 0` was
+ * dropped on mason views, and `rem`/`em` lost their units.
+ *
+ * Adding the package to the bundle entry right before the app entry registers
+ * MasonKit's properties first, exactly as if it were the app's first import.
+ *
+ * @param {typeof import('@nativescript/webpack')} webpack
+ */
+module.exports = (webpack) => {
+  webpack.chainWebpack((config) => {
+    const bundle = config.entry('bundle');
+    const entries = bundle.values();
+    const appEntry = entries.lastIndexOf(webpack.Utils.platform.getEntryPath());
+    if (appEntry === -1 || entries.includes('@triniwiz/nativescript-masonkit')) {
+      return;
+    }
+    entries.splice(appEntry, 0, '@triniwiz/nativescript-masonkit');
+    bundle.clear();
+    entries.forEach((entry) => bundle.add(entry));
+  });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triniwiz/nativescript-masonkit",
-  "version": "1.0.0-beta.109",
+  "version": "1.0.0-beta.110",
   "description": "Web Inspired Layout",
   "main": "index",
   "typings": "index.d.ts",

package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.abi.json

@@ -96628,31 +96628,38 @@
       "length": 3,
       "value": "1.0"
     },
+    {
+      "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/nativescript-mason\/packages\/nativescript-masonkit\/src-native\/mason-ios\/Mason\/Mason\/text\/TextEngine.swift",
+      "kind": "StringLiteral",
+      "offset": 77200,
+      "length": 17,
+      "value": "\" \t\n\r\f\""
+    },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/nativescript-mason\/packages\/nativescript-masonkit\/src-native\/mason-ios\/Mason\/Mason\/text\/TextEngine.swift",
       "kind": "BooleanLiteral",
-      "offset": 77305,
+      "offset": 78867,
       "length": 5,
       "value": "false"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/nativescript-mason\/packages\/nativescript-masonkit\/src-native\/mason-ios\/Mason\/Mason\/text\/TextEngine.swift",
       "kind": "IntegerLiteral",
-      "offset": 93074,
+      "offset": 95715,
       "length": 4,
       "value": "2048"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/nativescript-mason\/packages\/nativescript-masonkit\/src-native\/mason-ios\/Mason\/Mason\/text\/TextEngine.swift",
       "kind": "Dictionary",
-      "offset": 93473,
+      "offset": 96114,
       "length": 3,
       "value": "[]"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/nativescript-mason\/packages\/nativescript-masonkit\/src-native\/mason-ios\/Mason\/Mason\/text\/TextEngine.swift",
       "kind": "IntegerLiteral",
-      "offset": 96065,
+      "offset": 98706,
       "length": 1,
       "value": "0"
     },