@tamagui/z-index-stack 1.141.2 → 1.141.3
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/useStackedZIndex.cjs +7 -3
- package/dist/cjs/useStackedZIndex.js +2 -5
- package/dist/cjs/useStackedZIndex.js.map +1 -1
- package/dist/cjs/useStackedZIndex.native.js +9 -5
- package/dist/cjs/useStackedZIndex.native.js.map +1 -1
- package/dist/esm/useStackedZIndex.js +2 -5
- package/dist/esm/useStackedZIndex.js.map +1 -1
- package/dist/esm/useStackedZIndex.mjs +7 -3
- package/dist/esm/useStackedZIndex.mjs.map +1 -1
- package/dist/esm/useStackedZIndex.native.js +9 -5
- package/dist/esm/useStackedZIndex.native.js.map +1 -1
- package/package.json +2 -2
- package/src/useStackedZIndex.tsx +12 -7
- package/types/useStackedZIndex.d.ts.map +1 -1
|
@@ -61,9 +61,13 @@ const ZIndicesByContext = {},
|
|
|
61
61
|
if (typeof zIndexProp == "number") return zIndexProp;
|
|
62
62
|
if (stackZIndex) {
|
|
63
63
|
if (hardcoded) return hardcoded + 1;
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
|
|
64
|
+
const entries = Object.values(stackContext),
|
|
65
|
+
baseForLayer = stackLayer * 5e3,
|
|
66
|
+
nextLayerBase = (stackLayer + 1) * 5e3,
|
|
67
|
+
validEntries = entries.filter(z => z < nextLayerBase),
|
|
68
|
+
highest = validEntries.length > 0 ? Math.max(...validEntries) : baseForLayer,
|
|
69
|
+
nextZIndex = highest === baseForLayer ? baseForLayer + 1 : highest + 1;
|
|
70
|
+
return typeof stackZIndex == "number" ? stackZIndex + nextZIndex : nextZIndex;
|
|
67
71
|
}
|
|
68
72
|
return 1;
|
|
69
73
|
}, [stackLayer, zIndexProp, stackZIndex]);
|
|
@@ -45,11 +45,8 @@ const ZIndicesByContext = {}, CurrentPortalZIndices = {}, useStackedZIndex = (pr
|
|
|
45
45
|
if (stackZIndex) {
|
|
46
46
|
if (hardcoded)
|
|
47
47
|
return hardcoded + 1;
|
|
48
|
-
const
|
|
49
|
-
|
|
50
|
-
0
|
|
51
|
-
), found = stackLayer * 5e3 + highest + 1;
|
|
52
|
-
return typeof stackZIndex == "number" ? stackZIndex + found : found;
|
|
48
|
+
const entries = Object.values(stackContext), baseForLayer = stackLayer * 5e3, nextLayerBase = (stackLayer + 1) * 5e3, validEntries = entries.filter((z) => z < nextLayerBase), highest = validEntries.length > 0 ? Math.max(...validEntries) : baseForLayer, nextZIndex = highest === baseForLayer ? baseForLayer + 1 : highest + 1;
|
|
49
|
+
return typeof stackZIndex == "number" ? stackZIndex + nextZIndex : nextZIndex;
|
|
53
50
|
}
|
|
54
51
|
return 1;
|
|
55
52
|
}, [stackLayer, zIndexProp, stackZIndex]);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useStackedZIndex.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAsD,kBACtD,iBAA2D;AAI3D,MAAM,oBAA4D,CAAC,GAG7D,wBAAgD,CAAC,GAE1C,mBAAmB,CAAC,UAG3B;AACJ,MAAI,QAAQ,IAAI,8BAA8B;AAC5C,UAAM,EAAE,aAAa,QAAQ,WAAW,IAAI,OACtC,SAAK,oBAAM,GAEX,aAAS,sBAAQ,MAAM;AAC3B,UAAI,eAAe,gBAAgB,YAAY,eAAe,QAAW;AACvE,cAAM,UAAU,OAAO,OAAO,qBAAqB,EAAE;AAAA,UACnD,CAAC,KAAK,QAAQ,KAAK,IAAI,KAAK,GAAG;AAAA,UAC/B;AAAA,QACF;AACA,eAAO,KAAK,IAAI,gBAAgB,KAAO,IAAI,aAAa,UAAU,CAAC;AAAA,MACrE;AACA,aAAO,cAAc;AAAA,IACvB,GAAG,CAAC,WAAW,CAAC;AAEhB,uCAAU,MAAM;AACd,UAAI,OAAO,eAAgB;AACzB,qCAAsB,EAAE,IAAI,aACrB,MAAM;AACX,iBAAO,sBAAsB,EAAE;AAAA,QACjC;AAAA,IAEJ,GAAG,CAAC,WAAW,CAAC,GAET;AAAA,EACT,OAAO;AACL,UAAM,EAAE,aAAa,QAAQ,WAAW,IAAI,OACtC,SAAK,oBAAM,GACX,2BAAuB,yBAAW,iCAAkB,GACpD,aAAa,gBAAgB,WAAW,IAAI,sBAC5C,gBAAY,yBAAW,qCAAsB;AAEnD,sBAAkB,UAAU,MAAM,CAAC;AACnC,UAAM,eAAe,kBAAkB,UAAU,GAE3C,aAAS,sBAAQ,MAAM;AAC3B,UAAI,OAAO,cAAe;AACxB,eAAO;AAGT,UAAI,aAAa;AACf,YAAI;AACF,iBAAO,YAAY;AAGrB,cAAM,UAAU,OAAO,OAAO,YAAY,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAsD,kBACtD,iBAA2D;AAI3D,MAAM,oBAA4D,CAAC,GAG7D,wBAAgD,CAAC,GAE1C,mBAAmB,CAAC,UAG3B;AACJ,MAAI,QAAQ,IAAI,8BAA8B;AAC5C,UAAM,EAAE,aAAa,QAAQ,WAAW,IAAI,OACtC,SAAK,oBAAM,GAEX,aAAS,sBAAQ,MAAM;AAC3B,UAAI,eAAe,gBAAgB,YAAY,eAAe,QAAW;AACvE,cAAM,UAAU,OAAO,OAAO,qBAAqB,EAAE;AAAA,UACnD,CAAC,KAAK,QAAQ,KAAK,IAAI,KAAK,GAAG;AAAA,UAC/B;AAAA,QACF;AACA,eAAO,KAAK,IAAI,gBAAgB,KAAO,IAAI,aAAa,UAAU,CAAC;AAAA,MACrE;AACA,aAAO,cAAc;AAAA,IACvB,GAAG,CAAC,WAAW,CAAC;AAEhB,uCAAU,MAAM;AACd,UAAI,OAAO,eAAgB;AACzB,qCAAsB,EAAE,IAAI,aACrB,MAAM;AACX,iBAAO,sBAAsB,EAAE;AAAA,QACjC;AAAA,IAEJ,GAAG,CAAC,WAAW,CAAC,GAET;AAAA,EACT,OAAO;AACL,UAAM,EAAE,aAAa,QAAQ,WAAW,IAAI,OACtC,SAAK,oBAAM,GACX,2BAAuB,yBAAW,iCAAkB,GACpD,aAAa,gBAAgB,WAAW,IAAI,sBAC5C,gBAAY,yBAAW,qCAAsB;AAEnD,sBAAkB,UAAU,MAAM,CAAC;AACnC,UAAM,eAAe,kBAAkB,UAAU,GAE3C,aAAS,sBAAQ,MAAM;AAC3B,UAAI,OAAO,cAAe;AACxB,eAAO;AAGT,UAAI,aAAa;AACf,YAAI;AACF,iBAAO,YAAY;AAGrB,cAAM,UAAU,OAAO,OAAO,YAAY,GACpC,eAAe,aAAa,KAC5B,iBAAiB,aAAa,KAAK,KAInC,eAAe,QAAQ,OAAO,CAAC,MAAM,IAAI,aAAa,GAEtD,UAAU,aAAa,SAAS,IAAI,KAAK,IAAI,GAAG,YAAY,IAAI,cAGhE,aAAa,YAAY,eAAe,eAAe,IAAI,UAAU;AAG3E,eAAO,OAAO,eAAgB,WAAW,cAAc,aAAa;AAAA,MACtE;AAEA,aAAO;AAAA,IACT,GAAG,CAAC,YAAY,YAAY,WAAW,CAAC;AAExC,uCAAU,MAAM;AACd,UAAI;AACF,4BAAa,EAAE,IAAI,QACZ,MAAM;AACX,iBAAO,aAAa,EAAE;AAAA,QACxB;AAAA,IAEJ,GAAG,CAAC,MAAM,CAAC,GAEJ;AAAA,EACT;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -67,11 +67,15 @@ var import_react = require("react"),
|
|
|
67
67
|
if (typeof zIndexProp1 == "number") return zIndexProp1;
|
|
68
68
|
if (stackZIndex1) {
|
|
69
69
|
if (hardcoded) return hardcoded + 1;
|
|
70
|
-
var
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
70
|
+
var entries = Object.values(stackContext),
|
|
71
|
+
baseForLayer = stackLayer * 5e3,
|
|
72
|
+
nextLayerBase = (stackLayer + 1) * 5e3,
|
|
73
|
+
validEntries = entries.filter(function (z) {
|
|
74
|
+
return z < nextLayerBase;
|
|
75
|
+
}),
|
|
76
|
+
highest = validEntries.length > 0 ? Math.max(...validEntries) : baseForLayer,
|
|
77
|
+
nextZIndex = highest === baseForLayer ? baseForLayer + 1 : highest + 1;
|
|
78
|
+
return typeof stackZIndex1 == "number" ? stackZIndex1 + nextZIndex : nextZIndex;
|
|
75
79
|
}
|
|
76
80
|
return 1;
|
|
77
81
|
}, [stackLayer, zIndexProp1, stackZIndex1]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","useStackedZIndex_exports","__export","useStackedZIndex","module","exports","import_react","require","import_context","ZIndicesByContext","CurrentPortalZIndices","props","process","env","TAMAGUI_STACK_Z_INDEX_GLOBAL","stackZIndex","zIndex","zIndexProp","id","useId","useMemo","highest","Object","values","reduce","acc","cur","Math","max","useEffect","_ZIndicesByContext","_stackLayer","stackZIndex1","zIndexProp1","id1","stackingContextLevel","useContext","ZIndexStackContext","stackLayer","hardcoded","ZIndexHardcodedContext","stackContext","zIndex1","
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","useStackedZIndex_exports","__export","useStackedZIndex","module","exports","import_react","require","import_context","ZIndicesByContext","CurrentPortalZIndices","props","process","env","TAMAGUI_STACK_Z_INDEX_GLOBAL","stackZIndex","zIndex","zIndexProp","id","useId","useMemo","highest","Object","values","reduce","acc","cur","Math","max","useEffect","_ZIndicesByContext","_stackLayer","stackZIndex1","zIndexProp1","id1","stackingContextLevel","useContext","ZIndexStackContext","stackLayer","hardcoded","ZIndexHardcodedContext","stackContext","zIndex1","entries","baseForLayer","nextLayerBase","validEntries","filter","z","length","nextZIndex"],"sources":["../../src/useStackedZIndex.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,wBAAA;AAAAC,QAAA,CAAAD,wBAAA;EAAAE,gBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAsD,CAAAK,wBACK;AAI3D,IAAAK,YAAM,GAAAC,OAA4D,CAAC,OAG7D;EAAAC,cAAA,GAAgDD,OAEzC;EAAAE,iBAGP;EAAAC,qBAAA;EAAAP,gBAAA,YAAAA,CAAAQ,KAAA;IACJ,IAAIC,OAAA,CAAQC,GAAA,CAAIC,4BAAA,EAA8B;MAC5C;UAAMC,WAAE;UAAAC,MAAa,EAAAC;QAAQ,IAAWN,KAAI;QAAAO,EACtC,OAAAZ,YAAK,CAAAa,KAAA;QAAMH,MAEX,OAAAV,YAAS,CAAAc,OAAA,cAAc;UAC3B,IAAIL,WAAA,IAAeA,WAAA,KAAgB,YAAYE,UAAA,KAAe,QAAW;YACvE,IAAAI,OAAM,GAAAC,MAAU,CAAAC,MAAO,CAAAb,qBAAO,EAAqBc,MAAE,WAAAC,GAAA,EAAAC,GAAA;cACnD,OAAMC,IAAA,CAAAC,GAAQ,CAAAH,GAAK,EAAAC,GAAI;YAAQ,GAC/B;YACF,OAAAC,IAAA,CAAAC,GAAA,CAAAb,WAAA,cAAAA,WAAA,EAAAM,OAAA;UACA;UACF,OAAAJ,UAAA;QACA,IACFF,WAAI,CAEJ;MACE,OAAI,IAAAT,YAAO,CAAAuB,SAAgB;QACzB,WAAAd,WAAA,YAAwB,EAEtB,OAAAL,qBAAO,CAAAQ,EAAsB,IAAEH,WAAA;UACjC,OAAAL,qBAAA,CAAAQ,EAAA;QAEA;MAGN,IACEH,WAAQ,CAMR,GAAAC,MAAA;IACA;MAGE,IAAAc,kBAAW;QAAAC,WAAe;QAAA;UAAAhB,WAAA,EAAAiB,YAAA;UAAAhB,MAAA,EAAAiB;QAAA,IAAAtB,KAAA;QAAAuB,GAAA,OAAA5B,YAAA,CAAAa,KAAA;QAAAgB,oBAAA,OAAA7B,YAAA,CAAA8B,UAAA,EAAA5B,cAAA,CAAA6B,kBAAA;QAAAC,UAAA,GAAAN,YAAA,oBAAAG,oBAAA;QAAAI,SAAA,OAAAjC,YAAA,CAAA8B,UAAA,EAAA5B,cAAA,CAAAgC,sBAAA;MACxB,CAAAV,kBAAO,GAAArB,iBAAA,EAAAsB,WAAA,GAAAO,UAAA,MAAAR,kBAAA,CAAAC,WAAA;MAGT,IAAAU,YAAI,GAAahC,iBAAA,CAAA6B,UAAA;QAAAI,OAAA,OAAApC,YAAA,CAAAc,OAAA;UACf,WAAIa,WAAA,cACF,OAAAA,WAAO;UAGT,IAAAD,YAAM,EAAU;YAchB,IAAAO,SAAO,EACT,OAAAA,SAAA;YAEA,IAAAI,OAAO,GAAArB,MAAA,CAAAC,MAAA,CAAAkB,YAAA;cAAAG,YAAA,GAAAN,UAAA;cAAAO,aAAA,IAAAP,UAAA;cAAAQ,YAAA,GAAAH,OAAA,CAAAI,MAAA,WAAAC,CAAA;gBACL,OAAAA,CAAA,GAAYH,aAAY;cAE5B;cAAAxB,OAAA,GAAAyB,YAAA,CAAAG,MAAU,IAAM,GAAAtB,IAAA,CAAAC,GAAA,IAAAkB,YAAA,IAAAF,YAAA;cAAAM,UAAA,GAAA7B,OAAA,KAAAuB,YAAA,GAAAA,YAAA,OAAAvB,OAAA;YACd,OAAI,OAAAW,YAAA,eAAAA,YAAA,GAAAkB,UAAA,GAAAA,UAAA;UACF;UAEE;QAAsB,IAG5BZ,UAAW,EAGbL,WAAA,EACFD,YAAA,C","ignoreList":[]}
|
|
@@ -27,11 +27,8 @@ const ZIndicesByContext = {}, CurrentPortalZIndices = {}, useStackedZIndex = (pr
|
|
|
27
27
|
if (stackZIndex) {
|
|
28
28
|
if (hardcoded)
|
|
29
29
|
return hardcoded + 1;
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
0
|
|
33
|
-
), found = stackLayer * 5e3 + highest + 1;
|
|
34
|
-
return typeof stackZIndex == "number" ? stackZIndex + found : found;
|
|
30
|
+
const entries = Object.values(stackContext), baseForLayer = stackLayer * 5e3, nextLayerBase = (stackLayer + 1) * 5e3, validEntries = entries.filter((z) => z < nextLayerBase), highest = validEntries.length > 0 ? Math.max(...validEntries) : baseForLayer, nextZIndex = highest === baseForLayer ? baseForLayer + 1 : highest + 1;
|
|
31
|
+
return typeof stackZIndex == "number" ? stackZIndex + nextZIndex : nextZIndex;
|
|
35
32
|
}
|
|
36
33
|
return 1;
|
|
37
34
|
}, [stackLayer, zIndexProp, stackZIndex]);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useStackedZIndex.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,YAAY,WAAW,OAAO,eAAe;AACtD,SAAS,wBAAwB,0BAA0B;AAI3D,MAAM,oBAA4D,CAAC,GAG7D,wBAAgD,CAAC,GAE1C,mBAAmB,CAAC,UAG3B;AACJ,MAAI,QAAQ,IAAI,8BAA8B;AAC5C,UAAM,EAAE,aAAa,QAAQ,WAAW,IAAI,OACtC,KAAK,MAAM,GAEX,SAAS,QAAQ,MAAM;AAC3B,UAAI,eAAe,gBAAgB,YAAY,eAAe,QAAW;AACvE,cAAM,UAAU,OAAO,OAAO,qBAAqB,EAAE;AAAA,UACnD,CAAC,KAAK,QAAQ,KAAK,IAAI,KAAK,GAAG;AAAA,UAC/B;AAAA,QACF;AACA,eAAO,KAAK,IAAI,gBAAgB,KAAO,IAAI,aAAa,UAAU,CAAC;AAAA,MACrE;AACA,aAAO,cAAc;AAAA,IACvB,GAAG,CAAC,WAAW,CAAC;AAEhB,qBAAU,MAAM;AACd,UAAI,OAAO,eAAgB;AACzB,qCAAsB,EAAE,IAAI,aACrB,MAAM;AACX,iBAAO,sBAAsB,EAAE;AAAA,QACjC;AAAA,IAEJ,GAAG,CAAC,WAAW,CAAC,GAET;AAAA,EACT,OAAO;AACL,UAAM,EAAE,aAAa,QAAQ,WAAW,IAAI,OACtC,KAAK,MAAM,GACX,uBAAuB,WAAW,kBAAkB,GACpD,aAAa,gBAAgB,WAAW,IAAI,sBAC5C,YAAY,WAAW,sBAAsB;AAEnD,sBAAkB,UAAU,MAAM,CAAC;AACnC,UAAM,eAAe,kBAAkB,UAAU,GAE3C,SAAS,QAAQ,MAAM;AAC3B,UAAI,OAAO,cAAe;AACxB,eAAO;AAGT,UAAI,aAAa;AACf,YAAI;AACF,iBAAO,YAAY;AAGrB,cAAM,UAAU,OAAO,OAAO,YAAY,
|
|
4
|
+
"mappings": "AAAA,SAAS,YAAY,WAAW,OAAO,eAAe;AACtD,SAAS,wBAAwB,0BAA0B;AAI3D,MAAM,oBAA4D,CAAC,GAG7D,wBAAgD,CAAC,GAE1C,mBAAmB,CAAC,UAG3B;AACJ,MAAI,QAAQ,IAAI,8BAA8B;AAC5C,UAAM,EAAE,aAAa,QAAQ,WAAW,IAAI,OACtC,KAAK,MAAM,GAEX,SAAS,QAAQ,MAAM;AAC3B,UAAI,eAAe,gBAAgB,YAAY,eAAe,QAAW;AACvE,cAAM,UAAU,OAAO,OAAO,qBAAqB,EAAE;AAAA,UACnD,CAAC,KAAK,QAAQ,KAAK,IAAI,KAAK,GAAG;AAAA,UAC/B;AAAA,QACF;AACA,eAAO,KAAK,IAAI,gBAAgB,KAAO,IAAI,aAAa,UAAU,CAAC;AAAA,MACrE;AACA,aAAO,cAAc;AAAA,IACvB,GAAG,CAAC,WAAW,CAAC;AAEhB,qBAAU,MAAM;AACd,UAAI,OAAO,eAAgB;AACzB,qCAAsB,EAAE,IAAI,aACrB,MAAM;AACX,iBAAO,sBAAsB,EAAE;AAAA,QACjC;AAAA,IAEJ,GAAG,CAAC,WAAW,CAAC,GAET;AAAA,EACT,OAAO;AACL,UAAM,EAAE,aAAa,QAAQ,WAAW,IAAI,OACtC,KAAK,MAAM,GACX,uBAAuB,WAAW,kBAAkB,GACpD,aAAa,gBAAgB,WAAW,IAAI,sBAC5C,YAAY,WAAW,sBAAsB;AAEnD,sBAAkB,UAAU,MAAM,CAAC;AACnC,UAAM,eAAe,kBAAkB,UAAU,GAE3C,SAAS,QAAQ,MAAM;AAC3B,UAAI,OAAO,cAAe;AACxB,eAAO;AAGT,UAAI,aAAa;AACf,YAAI;AACF,iBAAO,YAAY;AAGrB,cAAM,UAAU,OAAO,OAAO,YAAY,GACpC,eAAe,aAAa,KAC5B,iBAAiB,aAAa,KAAK,KAInC,eAAe,QAAQ,OAAO,CAAC,MAAM,IAAI,aAAa,GAEtD,UAAU,aAAa,SAAS,IAAI,KAAK,IAAI,GAAG,YAAY,IAAI,cAGhE,aAAa,YAAY,eAAe,eAAe,IAAI,UAAU;AAG3E,eAAO,OAAO,eAAgB,WAAW,cAAc,aAAa;AAAA,MACtE;AAEA,aAAO;AAAA,IACT,GAAG,CAAC,YAAY,YAAY,WAAW,CAAC;AAExC,qBAAU,MAAM;AACd,UAAI;AACF,4BAAa,EAAE,IAAI,QACZ,MAAM;AACX,iBAAO,aAAa,EAAE;AAAA,QACxB;AAAA,IAEJ,GAAG,CAAC,MAAM,CAAC,GAEJ;AAAA,EACT;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -36,9 +36,13 @@ const ZIndicesByContext = {},
|
|
|
36
36
|
if (typeof zIndexProp == "number") return zIndexProp;
|
|
37
37
|
if (stackZIndex) {
|
|
38
38
|
if (hardcoded) return hardcoded + 1;
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
const entries = Object.values(stackContext),
|
|
40
|
+
baseForLayer = stackLayer * 5e3,
|
|
41
|
+
nextLayerBase = (stackLayer + 1) * 5e3,
|
|
42
|
+
validEntries = entries.filter(z => z < nextLayerBase),
|
|
43
|
+
highest = validEntries.length > 0 ? Math.max(...validEntries) : baseForLayer,
|
|
44
|
+
nextZIndex = highest === baseForLayer ? baseForLayer + 1 : highest + 1;
|
|
45
|
+
return typeof stackZIndex == "number" ? stackZIndex + nextZIndex : nextZIndex;
|
|
42
46
|
}
|
|
43
47
|
return 1;
|
|
44
48
|
}, [stackLayer, zIndexProp, stackZIndex]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useContext","useEffect","useId","useMemo","ZIndexHardcodedContext","ZIndexStackContext","ZIndicesByContext","CurrentPortalZIndices","useStackedZIndex","props","process","env","TAMAGUI_STACK_Z_INDEX_GLOBAL","stackZIndex","zIndex","zIndexProp","id","highest","Object","values","reduce","acc","cur","Math","max","stackingContextLevel","stackLayer","hardcoded","stackContext","
|
|
1
|
+
{"version":3,"names":["useContext","useEffect","useId","useMemo","ZIndexHardcodedContext","ZIndexStackContext","ZIndicesByContext","CurrentPortalZIndices","useStackedZIndex","props","process","env","TAMAGUI_STACK_Z_INDEX_GLOBAL","stackZIndex","zIndex","zIndexProp","id","highest","Object","values","reduce","acc","cur","Math","max","stackingContextLevel","stackLayer","hardcoded","stackContext","entries","baseForLayer","nextLayerBase","validEntries","filter","z","length","nextZIndex"],"sources":["../../src/useStackedZIndex.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAA,EAAYC,SAAA,EAAWC,KAAA,EAAOC,OAAA,QAAe;AACtD,SAASC,sBAAA,EAAwBC,kBAAA,QAA0B;AAI3D,MAAMC,iBAAA,GAA4D,CAAC;EAG7DC,qBAAA,GAAgD,CAAC;EAE1CC,gBAAA,GAAoBC,KAAA,IAG3B;IACJ,IAAIC,OAAA,CAAQC,GAAA,CAAIC,4BAAA,EAA8B;MAC5C,MAAM;UAAEC,WAAA;UAAaC,MAAA,EAAQC;QAAW,IAAIN,KAAA;QACtCO,EAAA,GAAKd,KAAA,CAAM;QAEXY,MAAA,GAASX,OAAA,CAAQ,MAAM;UAC3B,IAAIU,WAAA,IAAeA,WAAA,KAAgB,YAAYE,UAAA,KAAe,QAAW;YACvE,MAAME,OAAA,GAAUC,MAAA,CAAOC,MAAA,CAAOZ,qBAAqB,EAAEa,MAAA,CACnD,CAACC,GAAA,EAAKC,GAAA,KAAQC,IAAA,CAAKC,GAAA,CAAIH,GAAA,EAAKC,GAAG,GAC/B,CACF;YACA,OAAOC,IAAA,CAAKC,GAAA,CAAIX,WAAA,KAAgB,KAAO,IAAIA,WAAA,EAAaI,OAAA,GAAU,CAAC;UACrE;UACA,OAAOF,UAAA,IAAc;QACvB,GAAG,CAACF,WAAW,CAAC;MAEhB,OAAAZ,SAAA,CAAU,MAAM;QACd,IAAI,OAAOY,WAAA,IAAgB,UACzB,OAAAN,qBAAA,CAAsBS,EAAE,IAAIH,WAAA,EACrB,MAAM;UACX,OAAON,qBAAA,CAAsBS,EAAE;QACjC;MAEJ,GAAG,CAACH,WAAW,CAAC,GAETC,MAAA;IACT,OAAO;MACL,MAAM;UAAED,WAAA;UAAaC,MAAA,EAAQC;QAAW,IAAIN,KAAA;QACtCO,EAAA,GAAKd,KAAA,CAAM;QACXuB,oBAAA,GAAuBzB,UAAA,CAAWK,kBAAkB;QACpDqB,UAAA,GAAab,WAAA,KAAgB,WAAW,IAAIY,oBAAA;QAC5CE,SAAA,GAAY3B,UAAA,CAAWI,sBAAsB;MAEnDE,iBAAA,CAAkBoB,UAAU,MAAM,CAAC;MACnC,MAAME,YAAA,GAAetB,iBAAA,CAAkBoB,UAAU;QAE3CZ,MAAA,GAASX,OAAA,CAAQ,MAAM;UAC3B,IAAI,OAAOY,UAAA,IAAe,UACxB,OAAOA,UAAA;UAGT,IAAIF,WAAA,EAAa;YACf,IAAIc,SAAA,EACF,OAAOA,SAAA,GAAY;YAGrB,MAAME,OAAA,GAAUX,MAAA,CAAOC,MAAA,CAAOS,YAAY;cACpCE,YAAA,GAAeJ,UAAA,GAAa;cAC5BK,aAAA,IAAiBL,UAAA,GAAa,KAAK;cAInCM,YAAA,GAAeH,OAAA,CAAQI,MAAA,CAAQC,CAAA,IAAMA,CAAA,GAAIH,aAAa;cAEtDd,OAAA,GAAUe,YAAA,CAAaG,MAAA,GAAS,IAAIZ,IAAA,CAAKC,GAAA,CAAI,GAAGQ,YAAY,IAAIF,YAAA;cAGhEM,UAAA,GAAanB,OAAA,KAAYa,YAAA,GAAeA,YAAA,GAAe,IAAIb,OAAA,GAAU;YAG3E,OAAO,OAAOJ,WAAA,IAAgB,WAAWA,WAAA,GAAcuB,UAAA,GAAaA,UAAA;UACtE;UAEA,OAAO;QACT,GAAG,CAACV,UAAA,EAAYX,UAAA,EAAYF,WAAW,CAAC;MAExC,OAAAZ,SAAA,CAAU,MAAM;QACd,IAAIY,WAAA,EACF,OAAAe,YAAA,CAAaZ,EAAE,IAAIF,MAAA,EACZ,MAAM;UACX,OAAOc,YAAA,CAAaZ,EAAE;QACxB;MAEJ,GAAG,CAACF,MAAM,CAAC,GAEJA,MAAA;IACT;EACF","ignoreList":[]}
|
|
@@ -40,11 +40,15 @@ var ZIndicesByContext = {},
|
|
|
40
40
|
if (typeof zIndexProp1 == "number") return zIndexProp1;
|
|
41
41
|
if (stackZIndex1) {
|
|
42
42
|
if (hardcoded) return hardcoded + 1;
|
|
43
|
-
var
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
43
|
+
var entries = Object.values(stackContext),
|
|
44
|
+
baseForLayer = stackLayer * 5e3,
|
|
45
|
+
nextLayerBase = (stackLayer + 1) * 5e3,
|
|
46
|
+
validEntries = entries.filter(function (z) {
|
|
47
|
+
return z < nextLayerBase;
|
|
48
|
+
}),
|
|
49
|
+
highest = validEntries.length > 0 ? Math.max(...validEntries) : baseForLayer,
|
|
50
|
+
nextZIndex = highest === baseForLayer ? baseForLayer + 1 : highest + 1;
|
|
51
|
+
return typeof stackZIndex1 == "number" ? stackZIndex1 + nextZIndex : nextZIndex;
|
|
48
52
|
}
|
|
49
53
|
return 1;
|
|
50
54
|
}, [stackLayer, zIndexProp1, stackZIndex1]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useContext","useEffect","useId","useMemo","ZIndexHardcodedContext","ZIndexStackContext","ZIndicesByContext","CurrentPortalZIndices","useStackedZIndex","props","process","env","TAMAGUI_STACK_Z_INDEX_GLOBAL","stackZIndex","zIndex","zIndexProp","id","highest","Object","values","reduce","acc","cur","Math","max","_ZIndicesByContext","_stackLayer","stackZIndex1","zIndexProp1","id1","stackingContextLevel","stackLayer","hardcoded","stackContext","zIndex1","
|
|
1
|
+
{"version":3,"names":["useContext","useEffect","useId","useMemo","ZIndexHardcodedContext","ZIndexStackContext","ZIndicesByContext","CurrentPortalZIndices","useStackedZIndex","props","process","env","TAMAGUI_STACK_Z_INDEX_GLOBAL","stackZIndex","zIndex","zIndexProp","id","highest","Object","values","reduce","acc","cur","Math","max","_ZIndicesByContext","_stackLayer","stackZIndex1","zIndexProp1","id1","stackingContextLevel","stackLayer","hardcoded","stackContext","zIndex1","entries","baseForLayer","nextLayerBase","validEntries","filter","z","length","nextZIndex"],"sources":["../../src/useStackedZIndex.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAA,EAAYC,SAAA,EAAWC,KAAA,EAAOC,OAAA,QAAe;AACtD,SAASC,sBAAA,EAAwBC,kBAAA,QAA0B;AAI3D,IAAAC,iBAAM,KAA4D;EAACC,qBAG7D,KAAgD;EAACC,gBAE1C,YAAAA,CAAoBC,KAG3B;IACJ,IAAIC,OAAA,CAAQC,GAAA,CAAIC,4BAAA,EAA8B;MAC5C;UAAMC,WAAE;UAAAC,MAAa,EAAAC;QAAQ,IAAWN,KAAI;QAAAO,EACtC,GAAAd,KAAK;QAAMY,MAEX,GAAAX,OAAS,aAAc;UAC3B,IAAIU,WAAA,IAAeA,WAAA,KAAgB,YAAYE,UAAA,KAAe,QAAW;YACvE,IAAAE,OAAM,GAAAC,MAAU,CAAAC,MAAO,CAAAZ,qBAAO,EAAqBa,MAAE,WAAAC,GAAA,EAAAC,GAAA;cACnD,OAAMC,IAAA,CAAAC,GAAQ,CAAAH,GAAK,EAAAC,GAAI;YAAQ,GAC/B;YACF,OAAAC,IAAA,CAAAC,GAAA,CAAAX,WAAA,cAAAA,WAAA,EAAAI,OAAA;UACA;UACF,OAAAF,UAAA;QACA,IACFF,WAAI,CAEJ;MACE,OAAIZ,SAAO,aAAgB;QACzB,WAAAY,WAAA,YAAwB,EAEtB,OAAAN,qBAAO,CAAAS,EAAsB,IAAEH,WAAA;UACjC,OAAAN,qBAAA,CAAAS,EAAA;QAEA;MAGN,IACEH,WAAQ,CAMR,GAAAC,MAAA;IACA;MAGE,IAAAW,kBAAW;QAAAC,WAAe;QAAA;UAAAb,WAAA,EAAAc,YAAA;UAAAb,MAAA,EAAAc;QAAA,IAAAnB,KAAA;QAAAoB,GAAA,GAAA3B,KAAA;QAAA4B,oBAAA,GAAA9B,UAAA,CAAAK,kBAAA;QAAA0B,UAAA,GAAAJ,YAAA,oBAAAG,oBAAA;QAAAE,SAAA,GAAAhC,UAAA,CAAAI,sBAAA;MACxB,CAAAqB,kBAAO,GAAAnB,iBAAA,EAAAoB,WAAA,GAAAK,UAAA,MAAAN,kBAAA,CAAAC,WAAA;MAGT,IAAAO,YAAI,GAAa3B,iBAAA,CAAAyB,UAAA;QAAAG,OAAA,GAAA/B,OAAA;UACf,WAAIyB,WAAA,cACF,OAAAA,WAAO;UAGT,IAAAD,YAAM,EAAU;YAchB,IAAAK,SAAO,EACT,OAAAA,SAAA;YAEA,IAAAG,OAAO,GAAAjB,MAAA,CAAAC,MAAA,CAAAc,YAAA;cAAAG,YAAA,GAAAL,UAAA;cAAAM,aAAA,IAAAN,UAAA;cAAAO,YAAA,GAAAH,OAAA,CAAAI,MAAA,WAAAC,CAAA;gBACL,OAAAA,CAAA,GAAYH,aAAY;cAE5B;cAAApB,OAAA,GAAUqB,YAAM,CAAAG,MAAA,OAAAlB,IAAA,CAAAC,GAAA,IAAAc,YAAA,IAAAF,YAAA;cAAAM,UAAA,GAAAzB,OAAA,KAAAmB,YAAA,GAAAA,YAAA,OAAAnB,OAAA;YACd,OAAI,OAAAU,YAAA,eAAAA,YAAA,GAAAe,UAAA,GAAAA,UAAA;UACF;UAEE;QAAsB,IAG5BX,UAAW,EAGbH,WAAA,EACFD,YAAA,C","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/z-index-stack",
|
|
3
|
-
"version": "1.141.
|
|
3
|
+
"version": "1.141.3",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"source": "src/index.ts",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
}
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@tamagui/build": "1.141.
|
|
36
|
+
"@tamagui/build": "1.141.3",
|
|
37
37
|
"react": "*"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
package/src/useStackedZIndex.tsx
CHANGED
|
@@ -57,16 +57,21 @@ export const useStackedZIndex = (props: {
|
|
|
57
57
|
return hardcoded + 1
|
|
58
58
|
}
|
|
59
59
|
|
|
60
|
-
const
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
60
|
+
const entries = Object.values(stackContext)
|
|
61
|
+
const baseForLayer = stackLayer * 5000
|
|
62
|
+
const nextLayerBase = (stackLayer + 1) * 5000
|
|
63
|
+
|
|
64
|
+
// Filter out values that belong to higher layers
|
|
65
|
+
// Any value >= next layer's base is definitely not from this layer
|
|
66
|
+
const validEntries = entries.filter((z) => z < nextLayerBase)
|
|
67
|
+
|
|
68
|
+
const highest = validEntries.length > 0 ? Math.max(...validEntries) : baseForLayer
|
|
64
69
|
|
|
65
|
-
//
|
|
66
|
-
const
|
|
70
|
+
// If we only have the base value or nothing, start fresh
|
|
71
|
+
const nextZIndex = highest === baseForLayer ? baseForLayer + 1 : highest + 1
|
|
67
72
|
|
|
68
73
|
// setting stackZIndex to a number lets you increase it further
|
|
69
|
-
return typeof stackZIndex === 'number' ? stackZIndex +
|
|
74
|
+
return typeof stackZIndex === 'number' ? stackZIndex + nextZIndex : nextZIndex
|
|
70
75
|
}
|
|
71
76
|
|
|
72
77
|
return 1
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useStackedZIndex.d.ts","sourceRoot":"","sources":["../src/useStackedZIndex.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAQ9C,eAAO,MAAM,gBAAgB,GAAI,OAAO;IACtC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,eAAe,CAAA;CAC9B,
|
|
1
|
+
{"version":3,"file":"useStackedZIndex.d.ts","sourceRoot":"","sources":["../src/useStackedZIndex.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAQ9C,eAAO,MAAM,gBAAgB,GAAI,OAAO;IACtC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,eAAe,CAAA;CAC9B,WA6EA,CAAA"}
|