@tamagui/web 1.47.2 → 1.47.4

package/dist/cjs/helpers/withStaticProperties.js

@@ -21,18 +21,23 @@ __export(withStaticProperties_exports, {
   withStaticProperties: () => withStaticProperties
 });
 module.exports = __toCommonJS(withStaticProperties_exports);
-const WarnReAssignSymbol = Symbol();
+var import_react = require("react");
+const Decorated = Symbol();
 const withStaticProperties = function(component, staticProps) {
-  const next = typeof component === "function" ? component : { ...component };
-  if (process.env.NODE_ENV === "development") {
-    if (next[WarnReAssignSymbol]) {
-      throw new Error(
-        `Error: You're calling withStaticProperties() on a component that already has withStaticProperties() assigned to it! This will cause super strange errors.`
+  const next = (() => {
+    if (component[Decorated]) {
+      return (0, import_react.forwardRef)(
+        (props, ref) => (0, import_react.createElement)(component, { ...props, ref })
       );
     }
-    next[WarnReAssignSymbol] = true;
+    return component;
+  })();
+  for (const key in component) {
+    const v = component[key];
+    next[key] = v && typeof v === "object" ? { ...v } : v;
   }
   Object.assign(next, staticProps);
+  next[Decorated] = true;
   return next;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/helpers/withStaticProperties.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/withStaticProperties.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MAAM,qBAAqB,OAAO;AAE3B,MAAM,uBAAuB,SAClC,WACA,aACO;AAEP,QAAM,OAAO,OAAO,cAAc,aAAa,YAAY,EAAE,GAAI,UAAkB;AAGnF,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,KAAK,kBAAkB,GAAG;AAC5B,YAAM,IAAI;AAAA,QACR;AAAA,MACF;AAAA,IACF;AACA,SAAK,kBAAkB,IAAI;AAAA,EAC7B;AAEA,SAAO,OAAO,MAAM,WAAW;AAC/B,SAAO;AACT;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA0C;AAE1C,MAAM,YAAY,OAAO;AAElB,MAAM,uBAAuB,SAClC,WACA,aACO;AAEP,QAAM,QAAQ,MAAM;AAClB,QAAI,UAAU,SAAS,GAAG;AACxB,iBAAO;AAAA,QAAW,CAAC,OAAO,YACxB,4BAAc,WAAkB,EAAE,GAAG,OAAO,IAAI,CAAC;AAAA,MACnD;AAAA,IACF;AACA,WAAO;AAAA,EACT,GAAG;AAGH,aAAW,OAAO,WAAW;AAC3B,UAAM,IAAI,UAAU,GAAG;AAEvB,SAAK,GAAG,IAAI,KAAK,OAAO,MAAM,WAAW,EAAE,GAAG,EAAE,IAAI;AAAA,EACtD;AAGA,SAAO,OAAO,MAAM,WAAW;AAC/B,OAAK,SAAS,IAAI;AAElB,SAAO;AACT;",
   "names": []
 }

package/dist/esm/helpers/withStaticProperties.js

@@ -1,15 +1,20 @@
-const WarnReAssignSymbol = Symbol();
+import { createElement, forwardRef } from "react";
+const Decorated = Symbol();
 const withStaticProperties = function(component, staticProps) {
-  const next = typeof component === "function" ? component : { ...component };
-  if (process.env.NODE_ENV === "development") {
-    if (next[WarnReAssignSymbol]) {
-      throw new Error(
-        `Error: You're calling withStaticProperties() on a component that already has withStaticProperties() assigned to it! This will cause super strange errors.`
+  const next = (() => {
+    if (component[Decorated]) {
+      return forwardRef(
+        (props, ref) => createElement(component, { ...props, ref })
       );
     }
-    next[WarnReAssignSymbol] = true;
+    return component;
+  })();
+  for (const key in component) {
+    const v = component[key];
+    next[key] = v && typeof v === "object" ? { ...v } : v;
   }
   Object.assign(next, staticProps);
+  next[Decorated] = true;
   return next;
 };
 export {

package/dist/esm/helpers/withStaticProperties.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/withStaticProperties.tsx"],
-  "mappings": "AAAA,MAAM,qBAAqB,OAAO;AAE3B,MAAM,uBAAuB,SAClC,WACA,aACO;AAEP,QAAM,OAAO,OAAO,cAAc,aAAa,YAAY,EAAE,GAAI,UAAkB;AAGnF,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,KAAK,kBAAkB,GAAG;AAC5B,YAAM,IAAI;AAAA,QACR;AAAA,MACF;AAAA,IACF;AACA,SAAK,kBAAkB,IAAI;AAAA,EAC7B;AAEA,SAAO,OAAO,MAAM,WAAW;AAC/B,SAAO;AACT;",
+  "mappings": "AAAA,SAAS,eAAe,kBAAkB;AAE1C,MAAM,YAAY,OAAO;AAElB,MAAM,uBAAuB,SAClC,WACA,aACO;AAEP,QAAM,QAAQ,MAAM;AAClB,QAAI,UAAU,SAAS,GAAG;AACxB,aAAO;AAAA,QAAW,CAAC,OAAO,QACxB,cAAc,WAAkB,EAAE,GAAG,OAAO,IAAI,CAAC;AAAA,MACnD;AAAA,IACF;AACA,WAAO;AAAA,EACT,GAAG;AAGH,aAAW,OAAO,WAAW;AAC3B,UAAM,IAAI,UAAU,GAAG;AAEvB,SAAK,GAAG,IAAI,KAAK,OAAO,MAAM,WAAW,EAAE,GAAG,EAAE,IAAI;AAAA,EACtD;AAGA,SAAO,OAAO,MAAM,WAAW;AAC/B,OAAK,SAAS,IAAI;AAElB,SAAO;AACT;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.47.2",
+  "version": "1.47.4",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,19 +27,19 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.47.2",
-    "@tamagui/constants": "1.47.2",
-    "@tamagui/helpers": "1.47.2",
-    "@tamagui/normalize-css-color": "1.47.2",
-    "@tamagui/use-did-finish-ssr": "1.47.2",
-    "@tamagui/use-event": "1.47.2",
-    "@tamagui/use-force-update": "1.47.2"
+    "@tamagui/compose-refs": "1.47.4",
+    "@tamagui/constants": "1.47.4",
+    "@tamagui/helpers": "1.47.4",
+    "@tamagui/normalize-css-color": "1.47.4",
+    "@tamagui/use-did-finish-ssr": "1.47.4",
+    "@tamagui/use-event": "1.47.4",
+    "@tamagui/use-force-update": "1.47.4"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.47.2",
+    "@tamagui/build": "1.47.4",
     "@testing-library/react": "^13.4.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/helpers/withStaticProperties.tsx

@@ -1,22 +1,31 @@
-const WarnReAssignSymbol = Symbol()
+import { createElement, forwardRef } from 'react'
+
+const Decorated = Symbol()
 
 export const withStaticProperties = function <A extends Function, B>(
   component: A,
   staticProps: B
 ): A & B {
-  // clone if object to stay immutable
-  const next = typeof component === 'function' ? component : { ...(component as any) }
-
-  // nice dev helper that avoids super confusing errors
-  if (process.env.NODE_ENV === 'development') {
-    if (next[WarnReAssignSymbol]) {
-      throw new Error(
-        `Error: You're calling withStaticProperties() on a component that already has withStaticProperties() assigned to it! This will cause super strange errors.`
+  // clone component if already wrapped once
+  const next = (() => {
+    if (component[Decorated]) {
+      return forwardRef((props, ref) =>
+        createElement(component as any, { ...props, ref })
       )
     }
-    next[WarnReAssignSymbol] = true
+    return component
+  })()
+
+  // attach existing things again
+  for (const key in component) {
+    const v = component[key]
+    // @ts-ignore
+    next[key] = v && typeof v === 'object' ? { ...v } : v
   }
 
+  // add new things
   Object.assign(next, staticProps)
-  return next as A & B
+  next[Decorated] = true
+
+  return next as any as A & B
 }

package/types/helpers/withStaticProperties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withStaticProperties.d.ts","sourceRoot":"","sources":["../../src/helpers/withStaticProperties.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,gEAmBhC,CAAA"}
+{"version":3,"file":"withStaticProperties.d.ts","sourceRoot":"","sources":["../../src/helpers/withStaticProperties.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,gEA0BhC,CAAA"}