@juspay/svelte-ui-components 4.57.0 → 4.57.1

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.
@@ -8,7 +8,8 @@
8
8
  import { toStore } from 'svelte/store';
9
9
  import Button from '../Button/Button.svelte';
10
10
  import { focusTrapTabTarget, getActiveElement } from '../_interaction/focus';
11
- import { registerDismissible } from '../_interaction/dismissal';
11
+ import { registerDismissible, isTopmostDismissible } from '../_interaction/dismissal';
12
+ import { composedParent } from '../_interaction/focusable';
12
13
 
13
14
  let {
14
15
  open = $bindable(false),
@@ -155,10 +156,12 @@
155
156
  let scrollLockNode: HTMLElement | null = null;
156
157
  let releaseScrollLock: (() => void) | null = null;
157
158
  let scrollLockSpanEnded = false;
159
+ let reopenFocusRevision = 0;
158
160
 
159
161
  onMount(() =>
160
162
  toStore(() => open).subscribe((isOpen) => {
161
163
  if (!isOpen) {
164
+ reopenFocusRevision += 1;
162
165
  scrollLockSpanEnded = true;
163
166
  } else if (scrollLockSpanEnded && scrollLockNode !== null) {
164
167
  // Reversing an outro reuses the action. Resolve the next logical open's
@@ -169,6 +172,34 @@
169
172
  );
170
173
  releaseScrollLock?.();
171
174
  releaseScrollLock = releaseNext;
175
+ const node = scrollLockNode;
176
+ const panel = untrack(() => sheetPanel);
177
+ const revision = ++reopenFocusRevision;
178
+ void tick().then(() => {
179
+ if (
180
+ revision !== reopenFocusRevision ||
181
+ !open ||
182
+ scrollLockNode !== node ||
183
+ sheetPanel !== panel ||
184
+ panel === null ||
185
+ !node.isConnected ||
186
+ !panel.isConnected ||
187
+ !isTopmostDismissible(panel)
188
+ ) {
189
+ return;
190
+ }
191
+ // Keep focus/selection already owned through slot or shadow projection.
192
+ for (
193
+ let current = getActiveElement(panel);
194
+ current !== null;
195
+ current = composedParent(current)
196
+ ) {
197
+ if (current === panel) {
198
+ return;
199
+ }
200
+ }
201
+ panel.focus();
202
+ });
172
203
  }
173
204
  })
174
205
  );
@@ -201,6 +232,7 @@
201
232
  return {
202
233
  destroy() {
203
234
  active = false;
235
+ reopenFocusRevision += 1;
204
236
  releaseDismissible();
205
237
  releaseScrollLock?.();
206
238
  releaseScrollLock = null;
package/dist-wc/index.js CHANGED
@@ -24851,16 +24851,23 @@ function Sheet(e, t) {
24851
24851
  t !== null && (e.preventDefault(), t.focus());
24852
24852
  }
24853
24853
  }
24854
- let it = null, at = null, ot = !1;
24854
+ let it = null, at = null, ot = !1, ct = 0;
24855
24855
  onMount(() => toStore(() => n()).subscribe((e) => {
24856
- if (!e) ot = !0;
24856
+ if (!e) ct += 1, ot = !0;
24857
24857
  else if (ot && it !== null) {
24858
24858
  ot = !1;
24859
24859
  let e = untrack(() => acquireScrollLock(resolveScrollContainer(it, i())));
24860
24860
  at?.(), at = e;
24861
+ let t = it, a = untrack(() => get(G)), o = ++ct;
24862
+ tick().then(() => {
24863
+ if (!(o !== ct || !n() || it !== t || get(G) !== a || a === null || !t.isConnected || !a.isConnected || !isTopmostDismissible(a))) {
24864
+ for (let e = getActiveElement(a); e !== null; e = composedParent(e)) if (e === a) return;
24865
+ a.focus();
24866
+ }
24867
+ });
24861
24868
  }
24862
24869
  }));
24863
- function ct(e) {
24870
+ function lt(e) {
24864
24871
  let t = getActiveElement(e), n = !0;
24865
24872
  it = e, ot = !1, at = acquireScrollLock(resolveScrollContainer(e, i()));
24866
24873
  let a = registerDismissible({
@@ -24870,19 +24877,19 @@ function Sheet(e, t) {
24870
24877
  return tick().then(() => {
24871
24878
  n && get(G) !== null && get(G).focus();
24872
24879
  }), { destroy() {
24873
- n = !1, a(), at?.(), at = null, it = null;
24880
+ n = !1, ct += 1, a(), at?.(), at = null, it = null;
24874
24881
  let i = getActiveElement(e);
24875
24882
  t instanceof HTMLElement && t.isConnected && (i === null || i === document.body || e.contains(i)) && t.focus();
24876
24883
  } };
24877
24884
  }
24878
- function lt() {
24885
+ function ut() {
24879
24886
  typeof k() == "function" && k()();
24880
24887
  }
24881
- function ut() {
24888
+ function dt() {
24882
24889
  typeof R() == "function" && R()();
24883
24890
  }
24884
- let dt = /* @__PURE__ */ user_derived(() => typeof f() == "number" && Number.isInteger(f()) && f() >= 1 && f() <= 6 ? `h${f()}` : null);
24885
- var ft = {
24891
+ let ft = /* @__PURE__ */ user_derived(() => typeof f() == "number" && Number.isInteger(f()) && f() >= 1 && f() <= 6 ? `h${f()}` : null);
24892
+ var pt = {
24886
24893
  get open() {
24887
24894
  return n();
24888
24895
  },
@@ -24979,12 +24986,12 @@ function Sheet(e, t) {
24979
24986
  set classes(e) {
24980
24987
  te(e), flushSync();
24981
24988
  }
24982
- }, pt = comment(), mt = first_child(pt), ht = (e) => {
24989
+ }, mt = comment(), ht = first_child(mt), gt = (e) => {
24983
24990
  var t = root_4$28(), n = child(t), i = child(n), f = (e) => {
24984
24991
  var t = root_2$35(), n = child(t), i = (e) => {
24985
24992
  var t = comment(), n = first_child(t), i = (e) => {
24986
24993
  var t = comment();
24987
- element(first_child(t), () => get(dt), !1, (e, t) => {
24994
+ element(first_child(t), () => get(ft), !1, (e, t) => {
24988
24995
  set_class(e, 0, "sheet-title svelte-1dln6bq");
24989
24996
  var n = text();
24990
24997
  template_effect(() => set_text(n, o())), append(t, n);
@@ -24994,7 +25001,7 @@ function Sheet(e, t) {
24994
25001
  reset(t), template_effect(() => set_text(n, o())), append(e, t);
24995
25002
  };
24996
25003
  if_block(n, (e) => {
24997
- get(dt) === null ? e(a, -1) : e(i);
25004
+ get(ft) === null ? e(a, -1) : e(i);
24998
25005
  }), append(e, t);
24999
25006
  };
25000
25007
  if_block(n, (e) => {
@@ -25027,13 +25034,13 @@ function Sheet(e, t) {
25027
25034
  };
25028
25035
  if_block(k, (e) => {
25029
25036
  typeof S() == "function" && e(R);
25030
- }), reset(n), bind_this(n, (e) => set(G, e), () => get(G)), reset(t), bind_this(t, (e) => set(ne, e), () => get(ne)), action(t, (e) => ct?.(e)), template_effect((e) => {
25037
+ }), reset(n), bind_this(n, (e) => set(G, e), () => get(G)), reset(t), bind_this(t, (e) => set(ne, e), () => get(ne)), action(t, (e) => lt?.(e)), template_effect((e) => {
25031
25038
  set_class(t, 1, `sheet-overlay ${s() ? "overlay-visible" : "overlay-invisible"} ${s() || c() ? "overlay-interactive" : "overlay-noninteractive"} ${te() ?? "" ?? ""}`, "svelte-1dln6bq"), set_attribute(t, "role", c() ? "button" : null), set_attribute(t, "aria-label", e), set_attribute(t, "data-pw", typeof p() == "string" ? p() : null), set_attribute(t, "testid", typeof p() == "string" ? p() : null), set_class(n, 1, `sheet-panel ${a() ?? ""}`, "svelte-1dln6bq"), set_attribute(n, "aria-label", o() ?? "Sheet"), set_attribute(n, "data-pw", typeof p() == "string" ? `${p()}-panel` : null), set_attribute(n, "testid", typeof p() == "string" ? `${p()}-panel` : null);
25032
- }, [() => c() ? l()?.trim() || "Close sheet" : null]), delegated("click", t, Re), delegated("keydown", t, Ue), event("introend", n, lt), event("outroend", n, ut), transition(7, n, () => tokenizedFly, () => get(be)), transition(3, t, () => fade, () => ({ duration: 200 })), append(e, t);
25039
+ }, [() => c() ? l()?.trim() || "Close sheet" : null]), delegated("click", t, Re), delegated("keydown", t, Ue), event("introend", n, ut), event("outroend", n, dt), transition(7, n, () => tokenizedFly, () => get(be)), transition(3, t, () => fade, () => ({ duration: 200 })), append(e, t);
25033
25040
  };
25034
- return if_block(mt, (e) => {
25035
- n() && e(ht);
25036
- }), append(e, pt), pop(ft);
25041
+ return if_block(ht, (e) => {
25042
+ n() && e(gt);
25043
+ }), append(e, mt), pop(pt);
25037
25044
  }
25038
25045
  delegate(["click", "keydown"]), create_custom_element(Sheet, {
25039
25046
  open: {},
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@juspay/svelte-ui-components",
3
- "version": "4.57.0",
3
+ "version": "4.57.1",
4
4
  "description": "A themeable Svelte 5 UI component library with CSS custom property driven styling",
5
5
  "keywords": [
6
6
  "svelte",