@tamagui/core 1.0.1-beta.88 → 1.0.1-beta.89

package/dist/esm/constants/platform.js

@@ -1,9 +1,9 @@
-var _a, _b, _c;
+var _a, _b;
 import { useEffect, useLayoutEffect } from "react";
 import { Platform } from "react-native";
 const isAndroid = ((_a = Platform) == null ? void 0 : _a.OS) === "android";
 const isIOS = ((_b = Platform) == null ? void 0 : _b.OS) === "ios";
-const isWeb = process.env.TAMAGUI_TARGET !== "native" && (process.env.TAMAGUI_TARGET === "web" || ((_c = Platform) == null ? void 0 : _c.OS) === "web");
+const isWeb = process.env.TAMAGUI_TARGET === "web";
 const isSSR = isWeb && typeof window === "undefined";
 const isClient = isWeb && typeof window !== "undefined";
 const useIsomorphicLayoutEffect = isSSR ? useEffect : useLayoutEffect;

package/dist/esm/constants/platform.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/constants/platform.ts"],
-  "sourcesContent": ["import { useEffect, useLayoutEffect } from 'react'\nimport { Platform } from 'react-native'\n\nexport const isAndroid = Platform?.OS === 'android'\nexport const isIOS = Platform?.OS === 'ios'\n\nexport const isWeb =\n  process.env.TAMAGUI_TARGET !== 'native' &&\n  (process.env.TAMAGUI_TARGET === 'web' || Platform?.OS === 'web')\n\nexport const isSSR = isWeb && typeof window === 'undefined'\nexport const isClient = isWeb && typeof window !== 'undefined'\nexport const useIsomorphicLayoutEffect = isSSR ? useEffect : useLayoutEffect\nexport const isChrome = typeof navigator !== 'undefined' && /Chrome/.test(navigator.userAgent || '')\nexport const isWebTouchable = typeof window !== 'undefined' && 'ontouchstart' in window\nexport const isTouchable = !isWeb || isWebTouchable\nexport const isWebIOS =\n  isWeb &&\n  typeof navigator !== 'undefined' &&\n  (/iPad|iPhone|iPod/.test(navigator.platform) ||\n    (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1)) &&\n  !window['MSStream']\n"],
-  "mappings": "AAAA;AAAA;AACA;AAEO,MAAM,YAAY,uCAAU,QAAO;AACnC,MAAM,QAAQ,uCAAU,QAAO;AAE/B,MAAM,QACX,QAAQ,IAAI,mBAAmB,YAC9B,SAAQ,IAAI,mBAAmB,SAAS,uCAAU,QAAO;AAErD,MAAM,QAAQ,SAAS,OAAO,WAAW;AACzC,MAAM,WAAW,SAAS,OAAO,WAAW;AAC5C,MAAM,4BAA4B,QAAQ,YAAY;AACtD,MAAM,WAAW,OAAO,cAAc,eAAe,SAAS,KAAK,UAAU,aAAa,EAAE;AAC5F,MAAM,iBAAiB,OAAO,WAAW,eAAe,kBAAkB;AAC1E,MAAM,cAAc,CAAC,SAAS;AAC9B,MAAM,WACX,SACA,OAAO,cAAc,eACpB,oBAAmB,KAAK,UAAU,QAAQ,KACxC,UAAU,aAAa,cAAc,UAAU,iBAAiB,MACnE,CAAC,OAAO;",
+  "sourcesContent": ["import { useEffect, useLayoutEffect } from 'react'\nimport { Platform } from 'react-native'\n\nexport const isAndroid = Platform?.OS === 'android'\nexport const isIOS = Platform?.OS === 'ios'\nexport const isWeb = process.env.TAMAGUI_TARGET === 'web'\nexport const isSSR = isWeb && typeof window === 'undefined'\nexport const isClient = isWeb && typeof window !== 'undefined'\nexport const useIsomorphicLayoutEffect = isSSR ? useEffect : useLayoutEffect\nexport const isChrome = typeof navigator !== 'undefined' && /Chrome/.test(navigator.userAgent || '')\nexport const isWebTouchable = typeof window !== 'undefined' && 'ontouchstart' in window\nexport const isTouchable = !isWeb || isWebTouchable\nexport const isWebIOS =\n  isWeb &&\n  typeof navigator !== 'undefined' &&\n  (/iPad|iPhone|iPod/.test(navigator.platform) ||\n    (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1)) &&\n  !window['MSStream']\n"],
+  "mappings": "AAAA;AAAA;AACA;AAEO,MAAM,YAAY,uCAAU,QAAO;AACnC,MAAM,QAAQ,uCAAU,QAAO;AAC/B,MAAM,QAAQ,QAAQ,IAAI,mBAAmB;AAC7C,MAAM,QAAQ,SAAS,OAAO,WAAW;AACzC,MAAM,WAAW,SAAS,OAAO,WAAW;AAC5C,MAAM,4BAA4B,QAAQ,YAAY;AACtD,MAAM,WAAW,OAAO,cAAc,eAAe,SAAS,KAAK,UAAU,aAAa,EAAE;AAC5F,MAAM,iBAAiB,OAAO,WAAW,eAAe,kBAAkB;AAC1E,MAAM,cAAc,CAAC,SAAS;AAC9B,MAAM,WACX,SACA,OAAO,cAAc,eACpB,oBAAmB,KAAK,UAAU,QAAQ,KACxC,UAAU,aAAa,cAAc,UAAU,iBAAiB,MACnE,CAAC,OAAO;",
   "names": []
 }

package/dist/esm/createComponent.js

@@ -49,6 +49,7 @@ import { getConfig, onConfiguredOnce } from "./conf";
 import { stackDefaultStyles } from "./constants/constants";
 import { isWeb, useIsomorphicLayoutEffect } from "./constants/platform";
 import { rnw } from "./constants/rnw";
+import { assignNativePropsToWeb } from "./helpers/assignNativePropsToWeb";
 import { getReturnVariablesAs } from "./helpers/createPropMapper";
 import { createShallowUpdate } from "./helpers/createShallowUpdate";
 import { extendStaticConfig, parseStaticConfig } from "./helpers/extendStaticConfig";
@@ -726,9 +727,11 @@ function createComponent(configIn, ParentComponent) {
     }
     return content;
   });
-  component.displayName = staticConfig.componentName;
+  if (staticConfig.componentName) {
+    component.displayName = staticConfig.componentName;
+  }
   onConfiguredOnce((conf) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     if (process.env.IS_STATIC === "is_static") {
       return;
     }
@@ -739,38 +742,14 @@ function createComponent(configIn, ParentComponent) {
     AnimatedView = (_c = tamaguiConfig == null ? void 0 : tamaguiConfig.animations) == null ? void 0 : _c.View;
     initialTheme = initialTheme || proxyThemeVariables(conf.themes[conf.defaultTheme || Object.keys(conf.themes)[0]]);
     const config = getConfig();
-    let defaultPropsIn = staticConfig.defaultProps;
+    let defaultPropsIn = staticConfig.defaultProps || {};
     const parentNames = [...staticConfig.parentNames || [], staticConfig.componentName];
-    if (config.defaultProps && parentNames) {
-      const len = parentNames.length;
-      let prev;
-      for (let i = 0; i < len; i++) {
-        const n = parentNames[i];
-        if (!n)
-          continue;
-        if (DefaultProps.has(n)) {
-          prev = DefaultProps.get(n);
-          continue;
-        }
-        const props = config.defaultProps[n];
-        if (!props) {
-          if (prev) {
-            DefaultProps.set(n, prev);
-          }
-          continue;
-        }
-        prev = mergeProps(prev || {}, props)[0];
-        DefaultProps.set(n, prev);
-      }
-      const ourDefaultsMerged = DefaultProps.get(staticConfig.componentName);
-      if (ourDefaultsMerged) {
-        defaultPropsIn = mergeProps(defaultPropsIn, ourDefaultsMerged)[0];
-      }
+    if (config.defaultProps && parentNames && staticConfig.componentName) {
+      defaultPropsIn = mergeConfigDefaultProps(staticConfig.componentName, defaultPropsIn, config.defaultProps, parentNames);
     }
-    if (process.env.NODE_ENV === "development") {
-      if (defaultPropsIn["debug"] === "break") {
-        debugger;
-      }
+    const debug = process.env.NODE_ENV === "development" ? defaultPropsIn["debug"] : false;
+    if (process.env.NODE_ENV === "development" && debug === "break") {
+      debugger;
     }
     const [parentProps, parentClassNames] = mergeProps(defaultPropsIn, {}, true);
     initialSplitStyles = insertSplitStyles(parentProps, staticConfig, initialTheme, {
@@ -781,8 +760,11 @@ function createComponent(configIn, ParentComponent) {
       focus: false,
       resolveVariablesAs: "both",
       keepVariantsAsProps: true
-    }, void 0, staticConfig.defaultProps["debug"]);
+    }, void 0, debug);
     const [defaults, defaultsClassnames] = mergeProps(component.defaultProps, initialSplitStyles.viewProps, true);
+    if (debug) {
+      console.warn(defaults, component.defaultProps, initialSplitStyles);
+    }
     initialSplitStyles.classNames = __spreadValues(__spreadValues(__spreadValues({}, parentClassNames), defaultsClassnames), initialSplitStyles.classNames);
     defaultNativeStyle = {};
     const validStyles2 = staticConfig.validStyles || stylePropsView;
@@ -802,7 +784,7 @@ function createComponent(configIn, ParentComponent) {
     if (Object.keys(defaults).length) {
       tamaguiDefaultProps = defaults;
     }
-    if (process.env.NODE_ENV === "development" && ((_d = staticConfig.defaultProps) == null ? void 0 : _d.debug)) {
+    if (process.env.NODE_ENV === "development" && debug) {
       if (process.env.IS_STATIC !== "is_static") {
         console.log(`\u{1F41B} [${staticConfig.componentName || "Component"}]`, {
           staticConfig,
@@ -834,7 +816,6 @@ function createComponent(configIn, ParentComponent) {
   };
   return res;
 }
-const DefaultProps = /* @__PURE__ */ new Map();
 const Unspaced = (props) => {
   return props.children;
 };
@@ -981,165 +962,6 @@ const accessibilityRoleToWebRole = {
   summary: "region",
   text: null
 };
-function assignNativePropsToWeb(elementType, viewProps, nativeProps) {
-  if (!viewProps.role && nativeProps.accessibilityRole) {
-    if (nativeProps.accessibilityRole === "none") {
-      viewProps.role = "presentation";
-    } else {
-      const webRole = accessibilityRoleToWebRole[nativeProps.accessibilityRole];
-      if (webRole != null) {
-        viewProps.role = webRole || nativeProps.accessibilityRole;
-      }
-    }
-  }
-  if (nativeProps.accessibilityActiveDescendant != null) {
-    viewProps["aria-activedescendant"] = nativeProps.accessibilityActiveDescendant;
-  }
-  if (nativeProps.accessibilityAtomic != null) {
-    viewProps["aria-atomic"] = nativeProps.accessibilityAtomic;
-  }
-  if (nativeProps.accessibilityAutoComplete != null) {
-    viewProps["aria-autocomplete"] = nativeProps.accessibilityAutoComplete;
-  }
-  if (nativeProps.accessibilityBusy != null) {
-    viewProps["aria-busy"] = nativeProps.accessibilityBusy;
-  }
-  if (nativeProps.accessibilityChecked != null) {
-    viewProps["aria-checked"] = nativeProps.accessibilityChecked;
-  }
-  if (nativeProps.accessibilityColumnCount != null) {
-    viewProps["aria-colcount"] = nativeProps.accessibilityColumnCount;
-  }
-  if (nativeProps.accessibilityColumnIndex != null) {
-    viewProps["aria-colindex"] = nativeProps.accessibilityColumnIndex;
-  }
-  if (nativeProps.accessibilityColumnSpan != null) {
-    viewProps["aria-colspan"] = nativeProps.accessibilityColumnSpan;
-  }
-  if (nativeProps.accessibilityControls != null) {
-    viewProps["aria-controls"] = processIDRefList(nativeProps.accessibilityControls);
-  }
-  if (nativeProps.accessibilityCurrent != null) {
-    viewProps["aria-current"] = nativeProps.accessibilityCurrent;
-  }
-  if (nativeProps.accessibilityDescribedBy != null) {
-    viewProps["aria-describedby"] = processIDRefList(nativeProps.accessibilityDescribedBy);
-  }
-  if (nativeProps.accessibilityDetails != null) {
-    viewProps["aria-details"] = nativeProps.accessibilityDetails;
-  }
-  if (nativeProps.disabled === true) {
-    viewProps["aria-disabled"] = true;
-    if (elementType === "button" || elementType === "form" || elementType === "input" || elementType === "select" || elementType === "textarea") {
-      viewProps.disabled = true;
-    }
-  }
-  if (nativeProps.accessibilityErrorMessage != null) {
-    viewProps["aria-errormessage"] = nativeProps.accessibilityErrorMessage;
-  }
-  if (nativeProps.accessibilityExpanded != null) {
-    viewProps["aria-expanded"] = nativeProps.accessibilityExpanded;
-  }
-  if (nativeProps.accessibilityFlowTo != null) {
-    viewProps["aria-flowto"] = processIDRefList(nativeProps.accessibilityFlowTo);
-  }
-  if (nativeProps.accessibilityHasPopup != null) {
-    viewProps["aria-haspopup"] = nativeProps.accessibilityHasPopup;
-  }
-  if (nativeProps.accessibilityHidden === true) {
-    viewProps["aria-hidden"] = nativeProps.accessibilityHidden;
-  }
-  if (nativeProps.accessibilityInvalid != null) {
-    viewProps["aria-invalid"] = nativeProps.accessibilityInvalid;
-  }
-  if (nativeProps.accessibilityKeyShortcuts != null && Array.isArray(nativeProps.accessibilityKeyShortcuts)) {
-    viewProps["aria-keyshortcuts"] = nativeProps.accessibilityKeyShortcuts.join(" ");
-  }
-  if (nativeProps.accessibilityLabel != null) {
-    viewProps["aria-label"] = nativeProps.accessibilityLabel;
-  }
-  if (nativeProps.accessibilityLabelledBy != null) {
-    viewProps["aria-labelledby"] = processIDRefList(nativeProps.accessibilityLabelledBy);
-  }
-  if (nativeProps.accessibilityLevel != null) {
-    viewProps["aria-level"] = nativeProps.accessibilityLevel;
-  }
-  if (nativeProps.accessibilityLiveRegion != null) {
-    viewProps["aria-live"] = nativeProps.accessibilityLiveRegion === "none" ? "off" : nativeProps.accessibilityLiveRegion;
-  }
-  if (nativeProps.accessibilityModal != null) {
-    viewProps["aria-modal"] = nativeProps.accessibilityModal;
-  }
-  if (nativeProps.accessibilityMultiline != null) {
-    viewProps["aria-multiline"] = nativeProps.accessibilityMultiline;
-  }
-  if (nativeProps.accessibilityMultiSelectable != null) {
-    viewProps["aria-multiselectable"] = nativeProps.accessibilityMultiSelectable;
-  }
-  if (nativeProps.accessibilityOrientation != null) {
-    viewProps["aria-orientation"] = nativeProps.accessibilityOrientation;
-  }
-  if (nativeProps.accessibilityOwns != null) {
-    viewProps["aria-owns"] = processIDRefList(nativeProps.accessibilityOwns);
-  }
-  if (nativeProps.accessibilityPlaceholder != null) {
-    viewProps["aria-placeholder"] = nativeProps.accessibilityPlaceholder;
-  }
-  if (nativeProps.accessibilityPosInSet != null) {
-    viewProps["aria-posinset"] = nativeProps.accessibilityPosInSet;
-  }
-  if (nativeProps.accessibilityPressed != null) {
-    viewProps["aria-pressed"] = nativeProps.accessibilityPressed;
-  }
-  if (nativeProps.accessibilityReadOnly != null) {
-    viewProps["aria-readonly"] = nativeProps.accessibilityReadOnly;
-    if (elementType === "input" || elementType === "select" || elementType === "textarea") {
-      viewProps.readOnly = true;
-    }
-  }
-  if (nativeProps.accessibilityRequired != null) {
-    viewProps["aria-required"] = nativeProps.accessibilityRequired;
-    if (elementType === "input" || elementType === "select" || elementType === "textarea") {
-      viewProps.required = true;
-    }
-  }
-  if (nativeProps.accessibilityRoleDescription != null) {
-    viewProps["aria-roledescription"] = nativeProps.accessibilityRoleDescription;
-  }
-  if (nativeProps.accessibilityRowCount != null) {
-    viewProps["aria-rowcount"] = nativeProps.accessibilityRowCount;
-  }
-  if (nativeProps.accessibilityRowIndex != null) {
-    viewProps["aria-rowindex"] = nativeProps.accessibilityRowIndex;
-  }
-  if (nativeProps.accessibilityRowSpan != null) {
-    viewProps["aria-rowspan"] = nativeProps.accessibilityRowSpan;
-  }
-  if (nativeProps.accessibilitySelected != null) {
-    viewProps["aria-selected"] = nativeProps.accessibilitySelected;
-  }
-  if (nativeProps.accessibilitySetSize != null) {
-    viewProps["aria-setsize"] = nativeProps.accessibilitySetSize;
-  }
-  if (nativeProps.accessibilitySort != null) {
-    viewProps["aria-sort"] = nativeProps.accessibilitySort;
-  }
-  if (nativeProps.accessibilityValueMax != null) {
-    viewProps["aria-valuemax"] = nativeProps.accessibilityValueMax;
-  }
-  if (nativeProps.accessibilityValueMin != null) {
-    viewProps["aria-valuemin"] = nativeProps.accessibilityValueMin;
-  }
-  if (nativeProps.accessibilityValueNow != null) {
-    viewProps["aria-valuenow"] = nativeProps.accessibilityValueNow;
-  }
-  if (nativeProps.accessibilityValueText != null) {
-    viewProps["aria-valuetext"] = nativeProps.accessibilityValueText;
-  }
-  if (nativeProps.nativeID) {
-    viewProps.id = nativeProps.nativeID;
-  }
-}
 function addPseudoToStyles(styles, initialPseudos, pseudos, name, force = false) {
   const pseudoStyle = pseudos[name];
   const shouldNestObject = isWeb && name !== "enterStyle" && name !== "exitStyle";
@@ -1149,13 +971,43 @@ function addPseudoToStyles(styles, initialPseudos, pseudos, name, force = false)
     styles.push(shouldNestObject && !force ? { [name]: style } : style);
   }
 }
+const DefaultProps = /* @__PURE__ */ new Map();
+function mergeConfigDefaultProps(name, props, configDefaults, parentNames) {
+  const len = parentNames.length;
+  let prev;
+  for (let i = 0; i < len; i++) {
+    const n = parentNames[i];
+    if (!n)
+      continue;
+    if (DefaultProps.has(n)) {
+      prev = DefaultProps.get(n);
+      continue;
+    }
+    const props2 = configDefaults[n];
+    if (!props2) {
+      if (prev) {
+        DefaultProps.set(n, prev);
+      }
+      continue;
+    }
+    prev = mergeProps(prev || {}, props2)[0];
+    console.log("set prev", prev);
+    DefaultProps.set(n, prev);
+  }
+  const ourDefaultsMerged = DefaultProps.get(name);
+  if (ourDefaultsMerged) {
+    return mergeProps(props, ourDefaultsMerged)[0];
+  }
+  return props;
+}
 export {
   AbsoluteFill,
   Spacer,
   Unspaced,
-  assignNativePropsToWeb,
+  accessibilityRoleToWebRole,
   createComponent,
   mouseUps,
+  processIDRefList,
   spacedChildren
 };
 //# sourceMappingURL=createComponent.js.map