@oxyhq/services 6.9.21 → 6.9.22

package/lib/commonjs/ui/components/FontLoader.js

@@ -9,150 +9,75 @@ var _reactNative = require("react-native");
 var Font = _interopRequireWildcard(require("expo-font"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+// Single variable font file that covers all weights (100–900)
+const InterVariable = require('../../assets/fonts/Inter/InterVariable.ttf');
+const WEIGHT_NAMES = ['Light', 'Regular', 'Medium', 'SemiBold', 'Bold', 'ExtraBold', 'Black'];
+
 /**
- * Get the Inter font sources for both native and web environments
- * This is specifically designed to work when distributed as an npm package
- */const getInterFonts = () => {
-  try {
-    // For both development and when used as a package
-    // Load all static font weights
-    return {
-      'Inter-Light': require('../../assets/fonts/Inter/Inter_18pt-Light.ttf'),
-      'Inter-Regular': require('../../assets/fonts/Inter/Inter_18pt-Regular.ttf'),
-      'Inter-Medium': require('../../assets/fonts/Inter/Inter_18pt-Medium.ttf'),
-      'Inter-SemiBold': require('../../assets/fonts/Inter/Inter_18pt-SemiBold.ttf'),
-      'Inter-Bold': require('../../assets/fonts/Inter/Inter_18pt-Bold.ttf'),
-      'Inter-ExtraBold': require('../../assets/fonts/Inter/Inter_18pt-ExtraBold.ttf'),
-      'Inter-Black': require('../../assets/fonts/Inter/Inter_18pt-Black.ttf')
-    };
-  } catch (error) {
-    if (__DEV__) {
-      console.warn('Failed to load Inter fonts:', error);
-    }
-    return null;
+ * Build a font map using the single InterVariable.ttf for all weight aliases.
+ * A variable font contains every weight in one file, so we register it once
+ * per alias (e.g. Inter-Regular, Inter-Bold) to keep fontFamily references working.
+ */
+const getInterFonts = () => {
+  const fontMap = {};
+  fontMap['Inter'] = InterVariable;
+  for (const weight of WEIGHT_NAMES) {
+    fontMap[`Inter-${weight}`] = InterVariable;
   }
+  return fontMap;
 };
 
 /**
- * FontLoader component that loads custom fonts in the background while rendering children immediately
- * This works in both the package development and when consumed as an npm package
- * Children render immediately with system fonts as fallback until custom fonts are loaded
+ * FontLoader component that loads custom fonts in the background while rendering children immediately.
+ * Children render immediately with system fonts as fallback until custom fonts are loaded.
  */
 const FontLoader = ({
   children
 }) => {
   const [fontState, setFontState] = (0, _react.useState)('loading');
   (0, _react.useEffect)(() => {
-    const loadFonts = async () => {
-      try {
-        // Get all the font weights
-        const interFonts = getInterFonts();
-        if (!interFonts) {
-          throw new Error('Inter font files not found');
-        }
-
-        // Load all the static Inter fonts with their respective weights
-        await Font.loadAsync(interFonts);
-        setFontState('loaded');
-      } catch (error) {
-        if (__DEV__) {
-          console.error('Error loading fonts:', error);
-        }
-        setFontState('error');
+    Font.loadAsync(getInterFonts()).then(() => setFontState('loaded')).catch(error => {
+      if (__DEV__) {
+        console.error('Error loading fonts:', error);
       }
-    };
-    loadFonts();
+      setFontState('error');
+    });
   }, []);
-
-  // Always render children immediately - fonts will load in background
-  // If fonts aren't loaded yet, the app will use system fonts as fallback
   if (fontState === 'error' && __DEV__) {
     console.warn('Fonts failed to load. Using system fonts instead.');
   }
-
-  // Render children immediately, even while fonts are loading
-  // Fonts will apply when they're ready, otherwise system fonts are used
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: children
   });
 };
 
 /**
- * Setup fonts for applications consuming this package
- * This should be called by applications using your package
+ * Setup fonts for applications consuming this package.
  */
 exports.FontLoader = FontLoader;
 const setupFonts = async () => {
   try {
     const interFonts = getInterFonts();
-    if (!interFonts) {
-      throw new Error('Inter font files not found');
-    }
     if (_reactNative.Platform.OS === 'web') {
-      // For web platform, dynamically inject CSS to load the fonts
       if (typeof document !== 'undefined') {
-        // Create a style element
         const style = document.createElement('style');
-
-        // Define @font-face rules for each font weight
-        const fontFaceRules = `
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Light']}) format('truetype');
-                        font-weight: 300;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Regular']}) format('truetype');
-                        font-weight: 400;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Medium']}) format('truetype');
-                        font-weight: 500;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-SemiBold']}) format('truetype');
-                        font-weight: 600;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Bold']}) format('truetype');
-                        font-weight: 700;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-ExtraBold']}) format('truetype');
-                        font-weight: 800;
-                        font-style: normal;
-                    }
+        style.textContent = `
                     @font-face {
                         font-family: 'Inter';
-                        src: url(${interFonts['Inter-Black']}) format('truetype');
-                        font-weight: 900;
+                        src: url(${InterVariable}) format('truetype');
+                        font-weight: 100 900;
                         font-style: normal;
                     }
                 `;
-        style.textContent = fontFaceRules;
         document.head.appendChild(style);
-        if (__DEV__) {
-          console.info('All Inter web fonts have been dynamically loaded');
-        }
       }
     } else {
-      // Attempt to load the fonts anyway (this works if the consumer has linked the assets)
       await Font.loadAsync(interFonts);
     }
     return true;
   } catch (error) {
     if (__DEV__) {
-      const errorMessage = error instanceof Error ? error instanceof Error ? error.message : null : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       console.warn('Error setting up fonts:', errorMessage);
     }
     return false;

package/lib/commonjs/ui/components/FontLoader.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","Font","_interopRequireWildcard","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","getInterFonts","error","__DEV__","console","warn","FontLoader","children","fontState","setFontState","useState","useEffect","loadFonts","interFonts","Error","loadAsync","jsx","Fragment","exports","setupFonts","Platform","OS","document","style","createElement","fontFaceRules","textContent","head","appendChild","info","errorMessage","message","String"],"sourceRoot":"../../../../src","sources":["ui/components/FontLoader.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","Font","_interopRequireWildcard","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","InterVariable","WEIGHT_NAMES","getInterFonts","fontMap","weight","FontLoader","children","fontState","setFontState","useState","useEffect","loadAsync","then","catch","error","__DEV__","console","warn","jsx","Fragment","exports","setupFonts","interFonts","Platform","OS","document","style","createElement","textContent","head","appendChild","errorMessage","Error","message","String"],"sourceRoot":"../../../../src","sources":["ui/components/FontLoader.tsx"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAC,uBAAA,CAAAH,OAAA;AAAkC,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAG,wBAAAE,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAJ,uBAAA,YAAAA,CAAAE,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAElC;AACA,MAAMkB,aAAa,GAAGxB,OAAO,CAAC,4CAA4C,CAAC;AAE3E,MAAMyB,YAAY,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAU;;AAEtG;AACA;AACA;AACA;AACA;AACA,MAAMC,aAAa,GAAGA,CAAA,KAA2B;EAC7C,MAAMC,OAA4B,GAAG,CAAC,CAAC;EACvCA,OAAO,CAAC,OAAO,CAAC,GAAGH,aAAa;EAChC,KAAK,MAAMI,MAAM,IAAIH,YAAY,EAAE;IAC/BE,OAAO,CAAC,SAASC,MAAM,EAAE,CAAC,GAAGJ,aAAa;EAC9C;EACA,OAAOG,OAAO;AAClB,CAAC;;AAED;AACA;AACA;AACA;AACO,MAAME,UAAU,GAAGA,CAAC;EACvBC;AAGJ,CAAC,KAAK;EACF,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAC,eAAQ,EAAiC,SAAS,CAAC;EAErF,IAAAC,gBAAS,EAAC,MAAM;IACZhC,IAAI,CAACiC,SAAS,CAACT,aAAa,CAAC,CAAC,CAAC,CAC1BU,IAAI,CAAC,MAAMJ,YAAY,CAAC,QAAQ,CAAC,CAAC,CAClCK,KAAK,CAAEC,KAAK,IAAK;MACd,IAAIC,OAAO,EAAE;QACTC,OAAO,CAACF,KAAK,CAAC,sBAAsB,EAAEA,KAAK,CAAC;MAChD;MACAN,YAAY,CAAC,OAAO,CAAC;IACzB,CAAC,CAAC;EACV,CAAC,EAAE,EAAE,CAAC;EAEN,IAAID,SAAS,KAAK,OAAO,IAAIQ,OAAO,EAAE;IAClCC,OAAO,CAACC,IAAI,CAAC,mDAAmD,CAAC;EACrE;EAEA,oBAAO,IAAArC,WAAA,CAAAsC,GAAA,EAAAtC,WAAA,CAAAuC,QAAA;IAAAb,QAAA,EAAGA;EAAQ,CAAG,CAAC;AAC1B,CAAC;;AAED;AACA;AACA;AAFAc,OAAA,CAAAf,UAAA,GAAAA,UAAA;AAGO,MAAMgB,UAAU,GAAG,MAAAA,CAAA,KAA8B;EACpD,IAAI;IACA,MAAMC,UAAU,GAAGpB,aAAa,CAAC,CAAC;IAElC,IAAIqB,qBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;MACvB,IAAI,OAAOC,QAAQ,KAAK,WAAW,EAAE;QACjC,MAAMC,KAAK,GAAGD,QAAQ,CAACE,aAAa,CAAC,OAAO,CAAC;QAC7CD,KAAK,CAACE,WAAW,GAAG;AACpC;AACA;AACA,mCAAmC5B,aAAa;AAChD;AACA;AACA;AACA,iBAAiB;QACDyB,QAAQ,CAACI,IAAI,CAACC,WAAW,CAACJ,KAAK,CAAC;MACpC;IACJ,CAAC,MAAM;MACH,MAAMhD,IAAI,CAACiC,SAAS,CAACW,UAAU,CAAC;IACpC;IAEA,OAAO,IAAI;EACf,CAAC,CAAC,OAAOR,KAAc,EAAE;IACrB,IAAIC,OAAO,EAAE;MACT,MAAMgB,YAAY,GAAGjB,KAAK,YAAYkB,KAAK,GAAGlB,KAAK,CAACmB,OAAO,GAAGC,MAAM,CAACpB,KAAK,CAAC;MAC3EE,OAAO,CAACC,IAAI,CAAC,yBAAyB,EAAEc,YAAY,CAAC;IACzD;IACA,OAAO,KAAK;EAChB;AACJ,CAAC;AAACX,OAAA,CAAAC,UAAA,GAAAA,UAAA","ignoreList":[]}

package/lib/module/ui/components/FontLoader.js

@@ -4,151 +4,75 @@ import { useState, useEffect } from 'react';
 import { Platform } from 'react-native';
 import * as Font from 'expo-font';
 
+// Single variable font file that covers all weights (100–900)
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+const InterVariable = require('../../assets/fonts/Inter/InterVariable.ttf');
+const WEIGHT_NAMES = ['Light', 'Regular', 'Medium', 'SemiBold', 'Bold', 'ExtraBold', 'Black'];
+
 /**
- * Get the Inter font sources for both native and web environments
- * This is specifically designed to work when distributed as an npm package
+ * Build a font map using the single InterVariable.ttf for all weight aliases.
+ * A variable font contains every weight in one file, so we register it once
+ * per alias (e.g. Inter-Regular, Inter-Bold) to keep fontFamily references working.
  */
-import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 const getInterFonts = () => {
-  try {
-    // For both development and when used as a package
-    // Load all static font weights
-    return {
-      'Inter-Light': require('../../assets/fonts/Inter/Inter_18pt-Light.ttf'),
-      'Inter-Regular': require('../../assets/fonts/Inter/Inter_18pt-Regular.ttf'),
-      'Inter-Medium': require('../../assets/fonts/Inter/Inter_18pt-Medium.ttf'),
-      'Inter-SemiBold': require('../../assets/fonts/Inter/Inter_18pt-SemiBold.ttf'),
-      'Inter-Bold': require('../../assets/fonts/Inter/Inter_18pt-Bold.ttf'),
-      'Inter-ExtraBold': require('../../assets/fonts/Inter/Inter_18pt-ExtraBold.ttf'),
-      'Inter-Black': require('../../assets/fonts/Inter/Inter_18pt-Black.ttf')
-    };
-  } catch (error) {
-    if (__DEV__) {
-      console.warn('Failed to load Inter fonts:', error);
-    }
-    return null;
+  const fontMap = {};
+  fontMap['Inter'] = InterVariable;
+  for (const weight of WEIGHT_NAMES) {
+    fontMap[`Inter-${weight}`] = InterVariable;
   }
+  return fontMap;
 };
 
 /**
- * FontLoader component that loads custom fonts in the background while rendering children immediately
- * This works in both the package development and when consumed as an npm package
- * Children render immediately with system fonts as fallback until custom fonts are loaded
+ * FontLoader component that loads custom fonts in the background while rendering children immediately.
+ * Children render immediately with system fonts as fallback until custom fonts are loaded.
  */
 export const FontLoader = ({
   children
 }) => {
   const [fontState, setFontState] = useState('loading');
   useEffect(() => {
-    const loadFonts = async () => {
-      try {
-        // Get all the font weights
-        const interFonts = getInterFonts();
-        if (!interFonts) {
-          throw new Error('Inter font files not found');
-        }
-
-        // Load all the static Inter fonts with their respective weights
-        await Font.loadAsync(interFonts);
-        setFontState('loaded');
-      } catch (error) {
-        if (__DEV__) {
-          console.error('Error loading fonts:', error);
-        }
-        setFontState('error');
+    Font.loadAsync(getInterFonts()).then(() => setFontState('loaded')).catch(error => {
+      if (__DEV__) {
+        console.error('Error loading fonts:', error);
       }
-    };
-    loadFonts();
+      setFontState('error');
+    });
   }, []);
-
-  // Always render children immediately - fonts will load in background
-  // If fonts aren't loaded yet, the app will use system fonts as fallback
   if (fontState === 'error' && __DEV__) {
     console.warn('Fonts failed to load. Using system fonts instead.');
   }
-
-  // Render children immediately, even while fonts are loading
-  // Fonts will apply when they're ready, otherwise system fonts are used
   return /*#__PURE__*/_jsx(_Fragment, {
     children: children
   });
 };
 
 /**
- * Setup fonts for applications consuming this package
- * This should be called by applications using your package
+ * Setup fonts for applications consuming this package.
  */
 export const setupFonts = async () => {
   try {
     const interFonts = getInterFonts();
-    if (!interFonts) {
-      throw new Error('Inter font files not found');
-    }
     if (Platform.OS === 'web') {
-      // For web platform, dynamically inject CSS to load the fonts
       if (typeof document !== 'undefined') {
-        // Create a style element
         const style = document.createElement('style');
-
-        // Define @font-face rules for each font weight
-        const fontFaceRules = `
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Light']}) format('truetype');
-                        font-weight: 300;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Regular']}) format('truetype');
-                        font-weight: 400;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Medium']}) format('truetype');
-                        font-weight: 500;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-SemiBold']}) format('truetype');
-                        font-weight: 600;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Bold']}) format('truetype');
-                        font-weight: 700;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-ExtraBold']}) format('truetype');
-                        font-weight: 800;
-                        font-style: normal;
-                    }
+        style.textContent = `
                     @font-face {
                         font-family: 'Inter';
-                        src: url(${interFonts['Inter-Black']}) format('truetype');
-                        font-weight: 900;
+                        src: url(${InterVariable}) format('truetype');
+                        font-weight: 100 900;
                         font-style: normal;
                     }
                 `;
-        style.textContent = fontFaceRules;
         document.head.appendChild(style);
-        if (__DEV__) {
-          console.info('All Inter web fonts have been dynamically loaded');
-        }
       }
     } else {
-      // Attempt to load the fonts anyway (this works if the consumer has linked the assets)
       await Font.loadAsync(interFonts);
     }
     return true;
   } catch (error) {
     if (__DEV__) {
-      const errorMessage = error instanceof Error ? error instanceof Error ? error.message : null : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       console.warn('Error setting up fonts:', errorMessage);
     }
     return false;

package/lib/module/ui/components/FontLoader.js.map

@@ -1 +1 @@
-{"version":3,"names":["useState","useEffect","Platform","Font","Fragment","_Fragment","jsx","_jsx","getInterFonts","require","error","__DEV__","console","warn","FontLoader","children","fontState","setFontState","loadFonts","interFonts","Error","loadAsync","setupFonts","OS","document","style","createElement","fontFaceRules","textContent","head","appendChild","info","errorMessage","message","String"],"sourceRoot":"../../../../src","sources":["ui/components/FontLoader.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useState","useEffect","Platform","Font","Fragment","_Fragment","jsx","_jsx","InterVariable","require","WEIGHT_NAMES","getInterFonts","fontMap","weight","FontLoader","children","fontState","setFontState","loadAsync","then","catch","error","__DEV__","console","warn","setupFonts","interFonts","OS","document","style","createElement","textContent","head","appendChild","errorMessage","Error","message","String"],"sourceRoot":"../../../../src","sources":["ui/components/FontLoader.tsx"],"mappings":";;AACA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAC3C,SAASC,QAAQ,QAAQ,cAAc;AACvC,OAAO,KAAKC,IAAI,MAAM,WAAW;;AAEjC;AAAA,SAAAC,QAAA,IAAAC,SAAA,EAAAC,GAAA,IAAAC,IAAA;AACA,MAAMC,aAAa,GAAGC,OAAO,CAAC,4CAA4C,CAAC;AAE3E,MAAMC,YAAY,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAU;;AAEtG;AACA;AACA;AACA;AACA;AACA,MAAMC,aAAa,GAAGA,CAAA,KAA2B;EAC7C,MAAMC,OAA4B,GAAG,CAAC,CAAC;EACvCA,OAAO,CAAC,OAAO,CAAC,GAAGJ,aAAa;EAChC,KAAK,MAAMK,MAAM,IAAIH,YAAY,EAAE;IAC/BE,OAAO,CAAC,SAASC,MAAM,EAAE,CAAC,GAAGL,aAAa;EAC9C;EACA,OAAOI,OAAO;AAClB,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAME,UAAU,GAAGA,CAAC;EACvBC;AAGJ,CAAC,KAAK;EACF,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAGjB,QAAQ,CAAiC,SAAS,CAAC;EAErFC,SAAS,CAAC,MAAM;IACZE,IAAI,CAACe,SAAS,CAACP,aAAa,CAAC,CAAC,CAAC,CAC1BQ,IAAI,CAAC,MAAMF,YAAY,CAAC,QAAQ,CAAC,CAAC,CAClCG,KAAK,CAAEC,KAAK,IAAK;MACd,IAAIC,OAAO,EAAE;QACTC,OAAO,CAACF,KAAK,CAAC,sBAAsB,EAAEA,KAAK,CAAC;MAChD;MACAJ,YAAY,CAAC,OAAO,CAAC;IACzB,CAAC,CAAC;EACV,CAAC,EAAE,EAAE,CAAC;EAEN,IAAID,SAAS,KAAK,OAAO,IAAIM,OAAO,EAAE;IAClCC,OAAO,CAACC,IAAI,CAAC,mDAAmD,CAAC;EACrE;EAEA,oBAAOjB,IAAA,CAAAF,SAAA;IAAAU,QAAA,EAAGA;EAAQ,CAAG,CAAC;AAC1B,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMU,UAAU,GAAG,MAAAA,CAAA,KAA8B;EACpD,IAAI;IACA,MAAMC,UAAU,GAAGf,aAAa,CAAC,CAAC;IAElC,IAAIT,QAAQ,CAACyB,EAAE,KAAK,KAAK,EAAE;MACvB,IAAI,OAAOC,QAAQ,KAAK,WAAW,EAAE;QACjC,MAAMC,KAAK,GAAGD,QAAQ,CAACE,aAAa,CAAC,OAAO,CAAC;QAC7CD,KAAK,CAACE,WAAW,GAAG;AACpC;AACA;AACA,mCAAmCvB,aAAa;AAChD;AACA;AACA;AACA,iBAAiB;QACDoB,QAAQ,CAACI,IAAI,CAACC,WAAW,CAACJ,KAAK,CAAC;MACpC;IACJ,CAAC,MAAM;MACH,MAAM1B,IAAI,CAACe,SAAS,CAACQ,UAAU,CAAC;IACpC;IAEA,OAAO,IAAI;EACf,CAAC,CAAC,OAAOL,KAAc,EAAE;IACrB,IAAIC,OAAO,EAAE;MACT,MAAMY,YAAY,GAAGb,KAAK,YAAYc,KAAK,GAAGd,KAAK,CAACe,OAAO,GAAGC,MAAM,CAAChB,KAAK,CAAC;MAC3EE,OAAO,CAACC,IAAI,CAAC,yBAAyB,EAAEU,YAAY,CAAC;IACzD;IACA,OAAO,KAAK;EAChB;AACJ,CAAC","ignoreList":[]}

package/lib/typescript/commonjs/ui/components/FontLoader.d.ts

@@ -1,15 +1,13 @@
 import type React from 'react';
 /**
- * FontLoader component that loads custom fonts in the background while rendering children immediately
- * This works in both the package development and when consumed as an npm package
- * Children render immediately with system fonts as fallback until custom fonts are loaded
+ * FontLoader component that loads custom fonts in the background while rendering children immediately.
+ * Children render immediately with system fonts as fallback until custom fonts are loaded.
  */
 export declare const FontLoader: ({ children, }: {
     children: React.ReactNode;
 }) => import("react/jsx-runtime").JSX.Element;
 /**
- * Setup fonts for applications consuming this package
- * This should be called by applications using your package
+ * Setup fonts for applications consuming this package.
  */
 export declare const setupFonts: () => Promise<boolean>;
 //# sourceMappingURL=FontLoader.d.ts.map

package/lib/typescript/commonjs/ui/components/FontLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FontLoader.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/FontLoader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA8B/B;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAI,eAExB;IACC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B,4CAqCA,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,wBA+EtB,CAAC"}
+{"version":3,"file":"FontLoader.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/FontLoader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAwB/B;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,eAExB;IACC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B,4CAmBA,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,QAAa,OAAO,CAAC,OAAO,CA6BlD,CAAC"}

package/lib/typescript/module/ui/components/FontLoader.d.ts

@@ -1,15 +1,13 @@
 import type React from 'react';
 /**
- * FontLoader component that loads custom fonts in the background while rendering children immediately
- * This works in both the package development and when consumed as an npm package
- * Children render immediately with system fonts as fallback until custom fonts are loaded
+ * FontLoader component that loads custom fonts in the background while rendering children immediately.
+ * Children render immediately with system fonts as fallback until custom fonts are loaded.
  */
 export declare const FontLoader: ({ children, }: {
     children: React.ReactNode;
 }) => import("react/jsx-runtime").JSX.Element;
 /**
- * Setup fonts for applications consuming this package
- * This should be called by applications using your package
+ * Setup fonts for applications consuming this package.
  */
 export declare const setupFonts: () => Promise<boolean>;
 //# sourceMappingURL=FontLoader.d.ts.map

package/lib/typescript/module/ui/components/FontLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FontLoader.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/FontLoader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA8B/B;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAI,eAExB;IACC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B,4CAqCA,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,wBA+EtB,CAAC"}
+{"version":3,"file":"FontLoader.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/FontLoader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAwB/B;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,eAExB;IACC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B,4CAmBA,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,QAAa,OAAO,CAAC,OAAO,CA6BlD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "6.9.21",
+  "version": "6.9.22",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/src/ui/components/FontLoader.tsx

@@ -3,35 +3,28 @@ import { useState, useEffect } from 'react';
 import { Platform } from 'react-native';
 import * as Font from 'expo-font';
 
+// Single variable font file that covers all weights (100–900)
+const InterVariable = require('../../assets/fonts/Inter/InterVariable.ttf');
+
+const WEIGHT_NAMES = ['Light', 'Regular', 'Medium', 'SemiBold', 'Bold', 'ExtraBold', 'Black'] as const;
+
 /**
- * Get the Inter font sources for both native and web environments
- * This is specifically designed to work when distributed as an npm package
+ * Build a font map using the single InterVariable.ttf for all weight aliases.
+ * A variable font contains every weight in one file, so we register it once
+ * per alias (e.g. Inter-Regular, Inter-Bold) to keep fontFamily references working.
  */
-const getInterFonts = () => {
-    try {
-        // For both development and when used as a package
-        // Load all static font weights
-        return {
-            'Inter-Light': require('../../assets/fonts/Inter/Inter_18pt-Light.ttf'),
-            'Inter-Regular': require('../../assets/fonts/Inter/Inter_18pt-Regular.ttf'),
-            'Inter-Medium': require('../../assets/fonts/Inter/Inter_18pt-Medium.ttf'),
-            'Inter-SemiBold': require('../../assets/fonts/Inter/Inter_18pt-SemiBold.ttf'),
-            'Inter-Bold': require('../../assets/fonts/Inter/Inter_18pt-Bold.ttf'),
-            'Inter-ExtraBold': require('../../assets/fonts/Inter/Inter_18pt-ExtraBold.ttf'),
-            'Inter-Black': require('../../assets/fonts/Inter/Inter_18pt-Black.ttf'),
-        };
-    } catch (error) {
-        if (__DEV__) {
-        console.warn('Failed to load Inter fonts:', error);
-        }
-        return null;
+const getInterFonts = (): Record<string, any> => {
+    const fontMap: Record<string, any> = {};
+    fontMap['Inter'] = InterVariable;
+    for (const weight of WEIGHT_NAMES) {
+        fontMap[`Inter-${weight}`] = InterVariable;
     }
+    return fontMap;
 };
 
 /**
- * FontLoader component that loads custom fonts in the background while rendering children immediately
- * This works in both the package development and when consumed as an npm package
- * Children render immediately with system fonts as fallback until custom fonts are loaded
+ * FontLoader component that loads custom fonts in the background while rendering children immediately.
+ * Children render immediately with system fonts as fallback until custom fonts are loaded.
  */
 export const FontLoader = ({
     children,
@@ -41,122 +34,53 @@ export const FontLoader = ({
     const [fontState, setFontState] = useState<'loading' | 'loaded' | 'error'>('loading');
 
     useEffect(() => {
-        const loadFonts = async () => {
-            try {
-                // Get all the font weights
-                const interFonts = getInterFonts();
-
-                if (!interFonts) {
-                    throw new Error('Inter font files not found');
-                }
-
-                // Load all the static Inter fonts with their respective weights
-                await Font.loadAsync(interFonts);
-
-                setFontState('loaded');
-            } catch (error) {
+        Font.loadAsync(getInterFonts())
+            .then(() => setFontState('loaded'))
+            .catch((error) => {
                 if (__DEV__) {
-                console.error('Error loading fonts:', error);
+                    console.error('Error loading fonts:', error);
                 }
                 setFontState('error');
-            }
-        };
-
-        loadFonts();
+            });
     }, []);
 
-    // Always render children immediately - fonts will load in background
-    // If fonts aren't loaded yet, the app will use system fonts as fallback
     if (fontState === 'error' && __DEV__) {
         console.warn('Fonts failed to load. Using system fonts instead.');
     }
 
-    // Render children immediately, even while fonts are loading
-    // Fonts will apply when they're ready, otherwise system fonts are used
     return <>{children}</>;
 };
 
 /**
- * Setup fonts for applications consuming this package
- * This should be called by applications using your package
+ * Setup fonts for applications consuming this package.
  */
-export const setupFonts = async () => {
+export const setupFonts = async (): Promise<boolean> => {
     try {
         const interFonts = getInterFonts();
 
-        if (!interFonts) {
-            throw new Error('Inter font files not found');
-        }
-
         if (Platform.OS === 'web') {
-            // For web platform, dynamically inject CSS to load the fonts
             if (typeof document !== 'undefined') {
-                // Create a style element
                 const style = document.createElement('style');
-
-                // Define @font-face rules for each font weight
-                const fontFaceRules = `
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Light']}) format('truetype');
-                        font-weight: 300;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Regular']}) format('truetype');
-                        font-weight: 400;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Medium']}) format('truetype');
-                        font-weight: 500;
-                        font-style: normal;
-                    }
+                style.textContent = `
                     @font-face {
                         font-family: 'Inter';
-                        src: url(${interFonts['Inter-SemiBold']}) format('truetype');
-                        font-weight: 600;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Bold']}) format('truetype');
-                        font-weight: 700;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-ExtraBold']}) format('truetype');
-                        font-weight: 800;
-                        font-style: normal;
-                    }
-                    @font-face {
-                        font-family: 'Inter';
-                        src: url(${interFonts['Inter-Black']}) format('truetype');
-                        font-weight: 900;
+                        src: url(${InterVariable}) format('truetype');
+                        font-weight: 100 900;
                         font-style: normal;
                     }
                 `;
-
-                style.textContent = fontFaceRules;
                 document.head.appendChild(style);
-                if (__DEV__) {
-                console.info('All Inter web fonts have been dynamically loaded');
-                }
             }
         } else {
-            // Attempt to load the fonts anyway (this works if the consumer has linked the assets)
             await Font.loadAsync(interFonts);
         }
 
         return true;
     } catch (error: unknown) {
         if (__DEV__) {
-        const errorMessage = error instanceof Error ? (error instanceof Error ? error.message : null) : String(error);
-        console.warn('Error setting up fonts:', errorMessage);
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            console.warn('Error setting up fonts:', errorMessage);
         }
         return false;
     }
-};
+};