@tamagui/adapt 1.26.1 → 1.27.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/Adapt.js +4 -0
- package/dist/cjs/Adapt.js.map +1 -1
- package/dist/esm/Adapt.js +5 -0
- package/dist/esm/Adapt.js.map +1 -1
- package/package.json +3 -3
- package/src/Adapt.tsx +6 -0
- package/types/Adapt.d.ts.map +1 -1
package/dist/cjs/Adapt.js
CHANGED
|
@@ -58,6 +58,7 @@ const useAdaptParent = ({
|
|
|
58
58
|
const Adapt = (0, import_core.withStaticProperties)(
|
|
59
59
|
function Adapt2({ platform, when, children }) {
|
|
60
60
|
const context = (0, import_react.useContext)(AdaptParentContext);
|
|
61
|
+
const media = (0, import_core.useMedia)();
|
|
61
62
|
let enabled = !platform;
|
|
62
63
|
if (platform === "touch")
|
|
63
64
|
enabled = import_core.isTouchable;
|
|
@@ -65,6 +66,9 @@ const Adapt = (0, import_core.withStaticProperties)(
|
|
|
65
66
|
enabled = !import_core.isWeb;
|
|
66
67
|
if (platform === "web")
|
|
67
68
|
enabled = import_core.isWeb;
|
|
69
|
+
if (when && !media[when]) {
|
|
70
|
+
enabled = false;
|
|
71
|
+
}
|
|
68
72
|
(0, import_core.useIsomorphicLayoutEffect)(() => {
|
|
69
73
|
if (!enabled)
|
|
70
74
|
return;
|
package/dist/cjs/Adapt.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Adapt.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAsDQ;AAtDR,kBAOO;AACP,mBAA4E;AAkBrE,MAAM,yBAAqB,4BAA0C,IAAI;AAGzE,MAAM,gBAAgB,CAAC,UAAe;AAC3C,QAAM,cAAU,yBAAW,kBAAkB;AAC7C,MAAI,EAAC,mCAAS,WAAU;AACtB,UAAM,IAAI,MAAM,uCAAuC;AAAA,EACzD;AACA,aAAO,4BAAc,QAAQ,UAAU,KAAK;AAC9C;AAEA,cAAc,qBAAqB;AAE5B,MAAM,iBAAiB,CAAC;AAAA,EAC7B;AACF,MAEM;AACJ,QAAM,CAAC,MAAM,OAAO,QAAI,uBAAe,IAAI;AAE3C,QAAM,oBAAgB,sBAAQ,MAAM;AAClC,UAAM,UAA+B;AAAA,MACnC;AAAA,MACA;AAAA,IACF;AAEA,aAAS,kBAAkB,OAA2B;AACpD,aACE,4CAAC,mBAAmB,UAAnB,EAA4B,OAAO,SACjC,gBAAM,UACT;AAAA,IAEJ;AAEA,WAAO;AAAA,EACT,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;AAC7C,UAAM,YAAQ,sBAAS;AAEvB,QAAI,UAAU,CAAC;AACf,QAAI,aAAa;AAAS,gBAAU;AACpC,QAAI,aAAa;AAAU,gBAAU,CAAC;AACtC,QAAI,aAAa;AAAO,gBAAU;AAElC,QAAI,QAAQ,CAAC,MAAM,IAAI,GAAG;AACxB,gBAAU;AAAA,IACZ;AAEA,+CAA0B,MAAM;AAC9B,UAAI,CAAC;AAAS;AACd,yCAAS,QAAS,QAAQ;AAAA,IAC5B,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;",
|
|
5
5
|
"names": ["Adapt"]
|
|
6
6
|
}
|
package/dist/esm/Adapt.js
CHANGED
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
isTouchable,
|
|
4
4
|
isWeb,
|
|
5
5
|
useIsomorphicLayoutEffect,
|
|
6
|
+
useMedia,
|
|
6
7
|
withStaticProperties
|
|
7
8
|
} from "@tamagui/core";
|
|
8
9
|
import { createContext, createElement, useContext, useMemo, useState } from "react";
|
|
@@ -37,6 +38,7 @@ const useAdaptParent = ({
|
|
|
37
38
|
const Adapt = withStaticProperties(
|
|
38
39
|
function Adapt2({ platform, when, children }) {
|
|
39
40
|
const context = useContext(AdaptParentContext);
|
|
41
|
+
const media = useMedia();
|
|
40
42
|
let enabled = !platform;
|
|
41
43
|
if (platform === "touch")
|
|
42
44
|
enabled = isTouchable;
|
|
@@ -44,6 +46,9 @@ const Adapt = withStaticProperties(
|
|
|
44
46
|
enabled = !isWeb;
|
|
45
47
|
if (platform === "web")
|
|
46
48
|
enabled = isWeb;
|
|
49
|
+
if (when && !media[when]) {
|
|
50
|
+
enabled = false;
|
|
51
|
+
}
|
|
47
52
|
useIsomorphicLayoutEffect(() => {
|
|
48
53
|
if (!enabled)
|
|
49
54
|
return;
|
package/dist/esm/Adapt.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Adapt.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "AAsDQ;AAtDR;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,eAAe,eAAe,YAAY,SAAS,gBAAgB;AAkBrE,MAAM,qBAAqB,cAA0C,IAAI;AAGzE,MAAM,gBAAgB,CAAC,UAAe;AAC3C,QAAM,UAAU,WAAW,kBAAkB;AAC7C,MAAI,EAAC,mCAAS,WAAU;AACtB,UAAM,IAAI,MAAM,uCAAuC;AAAA,EACzD;AACA,SAAO,cAAc,QAAQ,UAAU,KAAK;AAC9C;AAEA,cAAc,qBAAqB;AAE5B,MAAM,iBAAiB,CAAC;AAAA,EAC7B;AACF,MAEM;AACJ,QAAM,CAAC,MAAM,OAAO,IAAI,SAAe,IAAI;AAE3C,QAAM,gBAAgB,QAAQ,MAAM;AAClC,UAAM,UAA+B;AAAA,MACnC;AAAA,MACA;AAAA,IACF;AAEA,aAAS,kBAAkB,OAA2B;AACpD,aACE,oBAAC,mBAAmB,UAAnB,EAA4B,OAAO,SACjC,gBAAM,UACT;AAAA,IAEJ;AAEA,WAAO;AAAA,EACT,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;AAC7C,UAAM,QAAQ,SAAS;AAEvB,QAAI,UAAU,CAAC;AACf,QAAI,aAAa;AAAS,gBAAU;AACpC,QAAI,aAAa;AAAU,gBAAU,CAAC;AACtC,QAAI,aAAa;AAAO,gBAAU;AAElC,QAAI,QAAQ,CAAC,MAAM,IAAI,GAAG;AACxB,gBAAU;AAAA,IACZ;AAEA,8BAA0B,MAAM;AAC9B,UAAI,CAAC;AAAS;AACd,yCAAS,QAAS,QAAQ;AAAA,IAC5B,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;",
|
|
5
5
|
"names": ["Adapt"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/adapt",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.27.0",
|
|
4
4
|
"types": "./types/index.d.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@tamagui/core": "1.
|
|
29
|
+
"@tamagui/core": "1.27.0"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
|
-
"@tamagui/build": "1.
|
|
32
|
+
"@tamagui/build": "1.27.0"
|
|
33
33
|
},
|
|
34
34
|
"publishConfig": {
|
|
35
35
|
"access": "public"
|
package/src/Adapt.tsx
CHANGED
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
isTouchable,
|
|
4
4
|
isWeb,
|
|
5
5
|
useIsomorphicLayoutEffect,
|
|
6
|
+
useMedia,
|
|
6
7
|
withStaticProperties,
|
|
7
8
|
} from '@tamagui/core'
|
|
8
9
|
import { createContext, createElement, useContext, useMemo, useState } from 'react'
|
|
@@ -69,12 +70,17 @@ export const useAdaptParent = ({
|
|
|
69
70
|
export const Adapt = withStaticProperties(
|
|
70
71
|
function Adapt({ platform, when, children }: AdaptProps) {
|
|
71
72
|
const context = useContext(AdaptParentContext)
|
|
73
|
+
const media = useMedia()
|
|
72
74
|
|
|
73
75
|
let enabled = !platform
|
|
74
76
|
if (platform === 'touch') enabled = isTouchable
|
|
75
77
|
if (platform === 'native') enabled = !isWeb
|
|
76
78
|
if (platform === 'web') enabled = isWeb
|
|
77
79
|
|
|
80
|
+
if (when && !media[when]) {
|
|
81
|
+
enabled = false
|
|
82
|
+
}
|
|
83
|
+
|
|
78
84
|
useIsomorphicLayoutEffect(() => {
|
|
79
85
|
if (!enabled) return
|
|
80
86
|
context?.setWhen((when || enabled) as When)
|
package/types/Adapt.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Adapt.d.ts","sourceRoot":"","sources":["../src/Adapt.tsx"],"names":[],"mappings":";AAAA,OAAO,EACL,aAAa,
|
|
1
|
+
{"version":3,"file":"Adapt.d.ts","sourceRoot":"","sources":["../src/Adapt.tsx"],"names":[],"mappings":";AAAA,OAAO,EACL,aAAa,EAMd,MAAM,eAAe,CAAA;AAGtB,KAAK,mBAAmB,GAAG,aAAa,SAAS,MAAM,GAAG,aAAa,GAAG,KAAK,CAAA;AAE/E,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,CAAC,EAAE,mBAAmB,CAAA;IAC1B,QAAQ,CAAC,EAAE,QAAQ,GAAG,KAAK,GAAG,OAAO,CAAA;IACrC,QAAQ,CAAC,EAAE,GAAG,CAAA;CACf,CAAA;AAED,KAAK,IAAI,GAAG,mBAAmB,GAAG,OAAO,GAAG,IAAI,CAAA;AAEhD,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAA;AACpC,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,SAAS,CAAA;IACnB,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,kBAAkB,qDAAkD,CAAA;AAGjF,eAAO,MAAM,aAAa;YAAW,GAAG;;CAMvC,CAAA;AAID,eAAO,MAAM,cAAc;cAGf,mBAAmB,CAAC,UAAU,CAAC;;2BAUL;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;KAAE;;CAevD,CAAA;AAED,eAAO,MAAM,KAAK,kCAC6B,UAAU;;gBAzCpB,GAAG;;;CAoEvC,CAAA"}
|