@tamagui/adapt 1.0.1-beta.228 → 1.0.1-rc.0

package/dist/cjs/index.js

@@ -52,11 +52,23 @@ const useAdaptParent = ({ Contents }) => {
   };
 };
 const Adapt = (0, import_core.withStaticProperties)(
-  function Adapt2({ when, children }) {
+  function Adapt2({ platform, when, children }) {
     const context = (0, import_react.useContext)(AdaptParentContext);
-    (0, import_react.useLayoutEffect)(() => {
+    let enabled = !platform;
+    if (platform === "touch")
+      enabled = import_core.isTouchable;
+    if (platform === "native")
+      enabled = !import_core.isWeb;
+    if (platform === "web")
+      enabled = import_core.isWeb;
+    (0, import_core.useIsomorphicLayoutEffect)(() => {
+      if (!enabled)
+        return;
       context == null ? void 0 : context.setWhen(when);
-    }, [when, context]);
+    }, [when, context, enabled]);
+    if (!enabled) {
+      return null;
+    }
     return children;
   },
   {

package/dist/cjs/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.tsx"],
-  "sourcesContent": ["import { MediaQueryKey, withStaticProperties } from '@tamagui/core'\nimport { createContext, createElement, useContext, useLayoutEffect, useMemo, useState } from 'react'\n\nexport type AdaptProps = {\n  when?: MediaQueryKey\n  children?: any\n}\n\ntype Component = (props: any) => any\n\ntype AdaptParentContextI = {\n  Contents: Component\n  setWhen: (when: MediaQueryKey) => any\n}\n\nconst AdaptParentContext = createContext<AdaptParentContextI | null>(null)\n\nexport const AdaptContents = () => {\n  const context = useContext(AdaptParentContext)\n  if (!context || !context.Contents) {\n    throw new Error(`Missing parent adapatable component, Adapt not supported here`)\n  }\n  return createElement(context.Contents)\n}\n\nexport const useAdaptParent = ({ Contents }: { Contents: AdaptParentContextI['Contents'] }) => {\n  const [when, setWhen] = useState<MediaQueryKey | null>(null)\n\n  const AdaptProvider = useMemo(() => {\n    const context: AdaptParentContextI = {\n      Contents,\n      setWhen,\n    }\n\n    return (props: { children?: any }) => (\n      <AdaptParentContext.Provider value={context}>{props.children}</AdaptParentContext.Provider>\n    )\n  }, [Contents])\n\n  return {\n    AdaptProvider,\n    when,\n  }\n}\n\nexport const Adapt = withStaticProperties(\n  function Adapt({ when, children }: AdaptProps) {\n    const context = useContext(AdaptParentContext)\n\n    useLayoutEffect(() => {\n      context?.setWhen(when as MediaQueryKey)\n    }, [when, context])\n\n    return children\n  },\n  {\n    Contents: AdaptContents,\n  }\n)\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAmCM;AAnCN,kBAAoD;AACpD,mBAA6F;AAc7F,MAAM,yBAAqB,4BAA0C,IAAI;AAElE,MAAM,gBAAgB,MAAM;AACjC,QAAM,cAAU,yBAAW,kBAAkB;AAC7C,MAAI,CAAC,WAAW,CAAC,QAAQ,UAAU;AACjC,UAAM,IAAI,MAAM,+DAA+D;AAAA,EACjF;AACA,aAAO,4BAAc,QAAQ,QAAQ;AACvC;AAEO,MAAM,iBAAiB,CAAC,EAAE,SAAS,MAAqD;AAC7F,QAAM,CAAC,MAAM,OAAO,QAAI,uBAA+B,IAAI;AAE3D,QAAM,oBAAgB,sBAAQ,MAAM;AAClC,UAAM,UAA+B;AAAA,MACnC;AAAA,MACA;AAAA,IACF;AAEA,WAAO,CAAC,UACN,4CAAC,mBAAmB,UAAnB;AAAA,MAA4B,OAAO;AAAA,MAAU,gBAAM;AAAA,KAAS;AAAA,EAEjE,GAAG,CAAC,QAAQ,CAAC;AAEb,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;AAEO,MAAM,YAAQ;AAAA,EACnB,SAASA,OAAM,EAAE,MAAM,SAAS,GAAe;AAC7C,UAAM,cAAU,yBAAW,kBAAkB;AAE7C,sCAAgB,MAAM;AACpB,yCAAS,QAAQ;AAAA,IACnB,GAAG,CAAC,MAAM,OAAO,CAAC;AAElB,WAAO;AAAA,EACT;AAAA,EACA;AAAA,IACE,UAAU;AAAA,EACZ;AACF;",
+  "sourcesContent": ["import {\n  MediaQueryKey,\n  isTouchable,\n  isWeb,\n  useIsomorphicLayoutEffect,\n  withStaticProperties,\n} from '@tamagui/core'\nimport { createContext, createElement, useContext, useMemo, useState } from 'react'\n\nexport type AdaptProps = {\n  when?: MediaQueryKey\n  platform?: 'native' | 'web' | 'touch'\n  children?: any\n}\n\ntype Component = (props: any) => any\ntype AdaptParentContextI = {\n  Contents: Component\n  setWhen: (when: MediaQueryKey) => any\n}\n\nconst AdaptParentContext = createContext<AdaptParentContextI | null>(null)\n\nexport const AdaptContents = () => {\n  const context = useContext(AdaptParentContext)\n  if (!context || !context.Contents) {\n    throw new Error(`Missing parent adapatable component, Adapt not supported here`)\n  }\n  return createElement(context.Contents)\n}\n\nexport const useAdaptParent = ({ Contents }: { Contents: AdaptParentContextI['Contents'] }) => {\n  const [when, setWhen] = useState<MediaQueryKey | null>(null)\n\n  const AdaptProvider = useMemo(() => {\n    const context: AdaptParentContextI = {\n      Contents,\n      setWhen,\n    }\n\n    return (props: { children?: any }) => (\n      <AdaptParentContext.Provider value={context}>{props.children}</AdaptParentContext.Provider>\n    )\n  }, [Contents])\n\n  return {\n    AdaptProvider,\n    when,\n  }\n}\n\nexport const Adapt = withStaticProperties(\n  function Adapt({ platform, when, children }: AdaptProps) {\n    const context = useContext(AdaptParentContext)\n\n    let enabled = !platform\n    if (platform === 'touch') enabled = isTouchable\n    if (platform === 'native') enabled = !isWeb\n    if (platform === 'web') enabled = isWeb\n\n    useIsomorphicLayoutEffect(() => {\n      if (!enabled) return\n      context?.setWhen(when as MediaQueryKey)\n    }, [when, context, enabled])\n\n    if (!enabled) {\n      return null\n    }\n\n    return children\n  },\n  {\n    Contents: AdaptContents,\n  }\n)\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAyCM;AAzCN,kBAMO;AACP,mBAA4E;AAc5E,MAAM,yBAAqB,4BAA0C,IAAI;AAElE,MAAM,gBAAgB,MAAM;AACjC,QAAM,cAAU,yBAAW,kBAAkB;AAC7C,MAAI,CAAC,WAAW,CAAC,QAAQ,UAAU;AACjC,UAAM,IAAI,MAAM,+DAA+D;AAAA,EACjF;AACA,aAAO,4BAAc,QAAQ,QAAQ;AACvC;AAEO,MAAM,iBAAiB,CAAC,EAAE,SAAS,MAAqD;AAC7F,QAAM,CAAC,MAAM,OAAO,QAAI,uBAA+B,IAAI;AAE3D,QAAM,oBAAgB,sBAAQ,MAAM;AAClC,UAAM,UAA+B;AAAA,MACnC;AAAA,MACA;AAAA,IACF;AAEA,WAAO,CAAC,UACN,4CAAC,mBAAmB,UAAnB;AAAA,MAA4B,OAAO;AAAA,MAAU,gBAAM;AAAA,KAAS;AAAA,EAEjE,GAAG,CAAC,QAAQ,CAAC;AAEb,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;AAEO,MAAM,YAAQ;AAAA,EACnB,SAASA,OAAM,EAAE,UAAU,MAAM,SAAS,GAAe;AACvD,UAAM,cAAU,yBAAW,kBAAkB;AAE7C,QAAI,UAAU,CAAC;AACf,QAAI,aAAa;AAAS,gBAAU;AACpC,QAAI,aAAa;AAAU,gBAAU,CAAC;AACtC,QAAI,aAAa;AAAO,gBAAU;AAElC,+CAA0B,MAAM;AAC9B,UAAI,CAAC;AAAS;AACd,yCAAS,QAAQ;AAAA,IACnB,GAAG,CAAC,MAAM,SAAS,OAAO,CAAC;AAE3B,QAAI,CAAC,SAAS;AACZ,aAAO;AAAA,IACT;AAEA,WAAO;AAAA,EACT;AAAA,EACA;AAAA,IACE,UAAU;AAAA,EACZ;AACF;",
   "names": ["Adapt"]
 }

package/dist/esm/index.js

@@ -1,6 +1,11 @@
 import { jsx } from "react/jsx-runtime";
-import { withStaticProperties } from "@tamagui/core";
-import { createContext, createElement, useContext, useLayoutEffect, useMemo, useState } from "react";
+import {
+  isTouchable,
+  isWeb,
+  useIsomorphicLayoutEffect,
+  withStaticProperties
+} from "@tamagui/core";
+import { createContext, createElement, useContext, useMemo, useState } from "react";
 const AdaptParentContext = createContext(null);
 const AdaptContents = () => {
   const context = useContext(AdaptParentContext);
@@ -27,11 +32,23 @@ const useAdaptParent = ({ Contents }) => {
   };
 };
 const Adapt = withStaticProperties(
-  function Adapt2({ when, children }) {
+  function Adapt2({ platform, when, children }) {
     const context = useContext(AdaptParentContext);
-    useLayoutEffect(() => {
+    let enabled = !platform;
+    if (platform === "touch")
+      enabled = isTouchable;
+    if (platform === "native")
+      enabled = !isWeb;
+    if (platform === "web")
+      enabled = isWeb;
+    useIsomorphicLayoutEffect(() => {
+      if (!enabled)
+        return;
       context == null ? void 0 : context.setWhen(when);
-    }, [when, context]);
+    }, [when, context, enabled]);
+    if (!enabled) {
+      return null;
+    }
     return children;
   },
   {

package/dist/esm/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.tsx"],
-  "sourcesContent": ["import { MediaQueryKey, withStaticProperties } from '@tamagui/core'\nimport { createContext, createElement, useContext, useLayoutEffect, useMemo, useState } from 'react'\n\nexport type AdaptProps = {\n  when?: MediaQueryKey\n  children?: any\n}\n\ntype Component = (props: any) => any\n\ntype AdaptParentContextI = {\n  Contents: Component\n  setWhen: (when: MediaQueryKey) => any\n}\n\nconst AdaptParentContext = createContext<AdaptParentContextI | null>(null)\n\nexport const AdaptContents = () => {\n  const context = useContext(AdaptParentContext)\n  if (!context || !context.Contents) {\n    throw new Error(`Missing parent adapatable component, Adapt not supported here`)\n  }\n  return createElement(context.Contents)\n}\n\nexport const useAdaptParent = ({ Contents }: { Contents: AdaptParentContextI['Contents'] }) => {\n  const [when, setWhen] = useState<MediaQueryKey | null>(null)\n\n  const AdaptProvider = useMemo(() => {\n    const context: AdaptParentContextI = {\n      Contents,\n      setWhen,\n    }\n\n    return (props: { children?: any }) => (\n      <AdaptParentContext.Provider value={context}>{props.children}</AdaptParentContext.Provider>\n    )\n  }, [Contents])\n\n  return {\n    AdaptProvider,\n    when,\n  }\n}\n\nexport const Adapt = withStaticProperties(\n  function Adapt({ when, children }: AdaptProps) {\n    const context = useContext(AdaptParentContext)\n\n    useLayoutEffect(() => {\n      context?.setWhen(when as MediaQueryKey)\n    }, [when, context])\n\n    return children\n  },\n  {\n    Contents: AdaptContents,\n  }\n)\n"],
-  "mappings": "AAmCM;AAnCN,SAAwB,4BAA4B;AACpD,SAAS,eAAe,eAAe,YAAY,iBAAiB,SAAS,gBAAgB;AAc7F,MAAM,qBAAqB,cAA0C,IAAI;AAElE,MAAM,gBAAgB,MAAM;AACjC,QAAM,UAAU,WAAW,kBAAkB;AAC7C,MAAI,CAAC,WAAW,CAAC,QAAQ,UAAU;AACjC,UAAM,IAAI,MAAM,+DAA+D;AAAA,EACjF;AACA,SAAO,cAAc,QAAQ,QAAQ;AACvC;AAEO,MAAM,iBAAiB,CAAC,EAAE,SAAS,MAAqD;AAC7F,QAAM,CAAC,MAAM,OAAO,IAAI,SAA+B,IAAI;AAE3D,QAAM,gBAAgB,QAAQ,MAAM;AAClC,UAAM,UAA+B;AAAA,MACnC;AAAA,MACA;AAAA,IACF;AAEA,WAAO,CAAC,UACN,oBAAC,mBAAmB,UAAnB;AAAA,MAA4B,OAAO;AAAA,MAAU,gBAAM;AAAA,KAAS;AAAA,EAEjE,GAAG,CAAC,QAAQ,CAAC;AAEb,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;AAEO,MAAM,QAAQ;AAAA,EACnB,SAASA,OAAM,EAAE,MAAM,SAAS,GAAe;AAC7C,UAAM,UAAU,WAAW,kBAAkB;AAE7C,oBAAgB,MAAM;AACpB,yCAAS,QAAQ;AAAA,IACnB,GAAG,CAAC,MAAM,OAAO,CAAC;AAElB,WAAO;AAAA,EACT;AAAA,EACA;AAAA,IACE,UAAU;AAAA,EACZ;AACF;",
+  "sourcesContent": ["import {\n  MediaQueryKey,\n  isTouchable,\n  isWeb,\n  useIsomorphicLayoutEffect,\n  withStaticProperties,\n} from '@tamagui/core'\nimport { createContext, createElement, useContext, useMemo, useState } from 'react'\n\nexport type AdaptProps = {\n  when?: MediaQueryKey\n  platform?: 'native' | 'web' | 'touch'\n  children?: any\n}\n\ntype Component = (props: any) => any\ntype AdaptParentContextI = {\n  Contents: Component\n  setWhen: (when: MediaQueryKey) => any\n}\n\nconst AdaptParentContext = createContext<AdaptParentContextI | null>(null)\n\nexport const AdaptContents = () => {\n  const context = useContext(AdaptParentContext)\n  if (!context || !context.Contents) {\n    throw new Error(`Missing parent adapatable component, Adapt not supported here`)\n  }\n  return createElement(context.Contents)\n}\n\nexport const useAdaptParent = ({ Contents }: { Contents: AdaptParentContextI['Contents'] }) => {\n  const [when, setWhen] = useState<MediaQueryKey | null>(null)\n\n  const AdaptProvider = useMemo(() => {\n    const context: AdaptParentContextI = {\n      Contents,\n      setWhen,\n    }\n\n    return (props: { children?: any }) => (\n      <AdaptParentContext.Provider value={context}>{props.children}</AdaptParentContext.Provider>\n    )\n  }, [Contents])\n\n  return {\n    AdaptProvider,\n    when,\n  }\n}\n\nexport const Adapt = withStaticProperties(\n  function Adapt({ platform, when, children }: AdaptProps) {\n    const context = useContext(AdaptParentContext)\n\n    let enabled = !platform\n    if (platform === 'touch') enabled = isTouchable\n    if (platform === 'native') enabled = !isWeb\n    if (platform === 'web') enabled = isWeb\n\n    useIsomorphicLayoutEffect(() => {\n      if (!enabled) return\n      context?.setWhen(when as MediaQueryKey)\n    }, [when, context, enabled])\n\n    if (!enabled) {\n      return null\n    }\n\n    return children\n  },\n  {\n    Contents: AdaptContents,\n  }\n)\n"],
+  "mappings": "AAyCM;AAzCN;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,eAAe,eAAe,YAAY,SAAS,gBAAgB;AAc5E,MAAM,qBAAqB,cAA0C,IAAI;AAElE,MAAM,gBAAgB,MAAM;AACjC,QAAM,UAAU,WAAW,kBAAkB;AAC7C,MAAI,CAAC,WAAW,CAAC,QAAQ,UAAU;AACjC,UAAM,IAAI,MAAM,+DAA+D;AAAA,EACjF;AACA,SAAO,cAAc,QAAQ,QAAQ;AACvC;AAEO,MAAM,iBAAiB,CAAC,EAAE,SAAS,MAAqD;AAC7F,QAAM,CAAC,MAAM,OAAO,IAAI,SAA+B,IAAI;AAE3D,QAAM,gBAAgB,QAAQ,MAAM;AAClC,UAAM,UAA+B;AAAA,MACnC;AAAA,MACA;AAAA,IACF;AAEA,WAAO,CAAC,UACN,oBAAC,mBAAmB,UAAnB;AAAA,MAA4B,OAAO;AAAA,MAAU,gBAAM;AAAA,KAAS;AAAA,EAEjE,GAAG,CAAC,QAAQ,CAAC;AAEb,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;AAEO,MAAM,QAAQ;AAAA,EACnB,SAASA,OAAM,EAAE,UAAU,MAAM,SAAS,GAAe;AACvD,UAAM,UAAU,WAAW,kBAAkB;AAE7C,QAAI,UAAU,CAAC;AACf,QAAI,aAAa;AAAS,gBAAU;AACpC,QAAI,aAAa;AAAU,gBAAU,CAAC;AACtC,QAAI,aAAa;AAAO,gBAAU;AAElC,8BAA0B,MAAM;AAC9B,UAAI,CAAC;AAAS;AACd,yCAAS,QAAQ;AAAA,IACnB,GAAG,CAAC,MAAM,SAAS,OAAO,CAAC;AAE3B,QAAI,CAAC,SAAS;AACZ,aAAO;AAAA,IACT;AAEA,WAAO;AAAA,EACT;AAAA,EACA;AAAA,IACE,UAAU;AAAA,EACZ;AACF;",
   "names": ["Adapt"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/adapt",
-  "version": "1.0.1-beta.228",
+  "version": "1.0.1-rc.0",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -18,10 +18,10 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/core": "^1.0.1-beta.228"
+    "@tamagui/core": "^1.0.1-rc.0"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-beta.228"
+    "@tamagui/build": "^1.0.1-rc.0"
   },
   "publishConfig": {
     "access": "public"

package/src/index.tsx

@@ -1,13 +1,19 @@
-import { MediaQueryKey, withStaticProperties } from '@tamagui/core'
-import { createContext, createElement, useContext, useLayoutEffect, useMemo, useState } from 'react'
+import {
+  MediaQueryKey,
+  isTouchable,
+  isWeb,
+  useIsomorphicLayoutEffect,
+  withStaticProperties,
+} from '@tamagui/core'
+import { createContext, createElement, useContext, useMemo, useState } from 'react'
 
 export type AdaptProps = {
   when?: MediaQueryKey
+  platform?: 'native' | 'web' | 'touch'
   children?: any
 }
 
 type Component = (props: any) => any
-
 type AdaptParentContextI = {
   Contents: Component
   setWhen: (when: MediaQueryKey) => any
@@ -44,12 +50,22 @@ export const useAdaptParent = ({ Contents }: { Contents: AdaptParentContextI['Co
 }
 
 export const Adapt = withStaticProperties(
-  function Adapt({ when, children }: AdaptProps) {
+  function Adapt({ platform, when, children }: AdaptProps) {
     const context = useContext(AdaptParentContext)
 
-    useLayoutEffect(() => {
+    let enabled = !platform
+    if (platform === 'touch') enabled = isTouchable
+    if (platform === 'native') enabled = !isWeb
+    if (platform === 'web') enabled = isWeb
+
+    useIsomorphicLayoutEffect(() => {
+      if (!enabled) return
       context?.setWhen(when as MediaQueryKey)
-    }, [when, context])
+    }, [when, context, enabled])
+
+    if (!enabled) {
+      return null
+    }
 
     return children
   },

package/types/index.d.ts

@@ -2,6 +2,7 @@
 import { MediaQueryKey } from '@tamagui/core';
 export declare type AdaptProps = {
     when?: MediaQueryKey;
+    platform?: 'native' | 'web' | 'touch';
     children?: any;
 };
 declare type Component = (props: any) => any;
@@ -18,7 +19,7 @@ export declare const useAdaptParent: ({ Contents }: {
     }) => JSX.Element;
     when: string | number | null;
 };
-export declare const Adapt: (({ when, children }: AdaptProps) => any) & {
+export declare const Adapt: (({ platform, when, children }: AdaptProps) => any) & {
     Contents: () => import("react").FunctionComponentElement<any>;
 };
 export {};