mirrors/OverlayScrollbars
2
0
Fork 0
mirror of https://github.com/tenrok/OverlayScrollbars.git synced 2026-06-20 05:50:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

pre init focused elements keep the focus after init

Browse Source
This commit is contained in:
Rene Haas
2022-08-08 20:41:39 +02:00
parent 185c000c5a
commit 7cdc6e1c8f
14 changed files with 196 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/overlayscrollbars/dist/browser/overlayscrollbars.browser.es5.js
Vendored
+49 -46
View File
@@ -1313,8 +1313,9 @@ var OverlayScrollbars = function(r) {
var V = R(He, f, S); var V = R(He, f, S);
var k = V === x; var k = V === x;
var q = k && z; var q = k && z;
var U = !k && M.top === M && P.activeElement === x; var U = P.activeElement;
var N = { var N = !k && M.top === M && U === x;
var Z = {
$: x, $: x,
J: A ? R(He, u, p) : x, J: A ? R(He, u, p) : x,
K: V, K: V,
@@ -1336,74 +1337,76 @@ var OverlayScrollbars = function(r) {
return k ? T(V, na, a, e) : (e ? pr : gr)(V, r); return k ? T(V, na, a, e) : (e ? pr : gr)(V, r);
} }
}; };
var Z = E(N).reduce((function(r, a) { var $ = E(Z).reduce((function(r, a) {
var e = N[a]; var e = Z[a];
return y(r, e && !F(e) ? e : false); return y(r, e && !F(e) ? e : false);
}), []); }), []);
var $ = function elementIsGenerated(r) { var J = function elementIsGenerated(r) {
return r ? m(Z, r) > -1 : null; return r ? m($, r) > -1 : null;
}; };
var J = N.$, K = N.J, Q = N.rr, rr = N.K, ar = N.ar, er = N.er; var K = Z.$, Q = Z.J, rr = Z.rr, ar = Z.K, er = Z.ar, nr = Z.er;
var nr = []; var tr = [];
var tr = A && $(K); var vr = A && J(Q);
var vr = A ? J : B([ ar, rr, Q, K, J ].find((function(r) { var ir = A ? K : B([ er, ar, rr, Q, K ].find((function(r) {
return false === $(r); return false === J(r);
}))); })));
var ir = ar || rr; var or = er || ar;
var or = function appendElements() { var ur = function appendElements() {
var r = Me(K, k ? "viewport" : "host"); var r = Me(Q, k ? "viewport" : "host");
var a = pr(Q, fa); var a = pr(rr, fa);
var e = pr(rr, !k && la); var e = pr(ar, !k && la);
var t = pr(ar, sa); var t = pr(er, sa);
var v = z ? pr(F(x), da) : Sr; var v = z ? pr(F(x), da) : Sr;
if (tr) { if (vr) {
G(J, K); G(K, Q);
y(nr, (function() { y(tr, (function() {
G(K, J); G(Q, K);
X(K); X(Q);
})); }));
} }
Y(ir, vr); Y(or, ir);
Y(K, Q); Y(Q, rr);
Y(Q || K, !k && rr); Y(rr || Q, !k && ar);
Y(rr, ar); Y(ar, er);
y(nr, (function() { y(tr, (function() {
v(); v();
r(); r();
D(rr, ta); D(ar, ta);
D(rr, va); D(ar, va);
if ($(ar)) { if (J(er)) {
De(er);
}
if (J(ar)) {
De(ar); De(ar);
} }
if ($(rr)) { if (J(rr)) {
De(rr); De(rr);
} }
if ($(Q)) {
De(Q);
}
a(); a();
e(); e();
t(); t();
})); }));
if (n && !k) { if (n && !k) {
y(nr, gr.bind(0, rr, da)); y(tr, gr.bind(0, ar, da));
} }
if (er) { if (nr) {
W(rr, er); W(ar, nr);
y(nr, X.bind(0, er)); y(tr, X.bind(0, nr));
} }
if (U) { if (N) {
var i = L(rr, Te); var i = L(ar, Te);
L(rr, Te, "-1"); L(ar, Te, "-1");
rr.focus(); ar.focus();
var o = Nr(P, "pointerdown keydown", (function() { var o = Nr(P, "pointerdown keydown", (function() {
i ? L(rr, Te, i) : D(rr, Te); i ? L(ar, Te, i) : D(ar, Te);
o(); o();
})); }));
} else if (U && U.focus) {
U.focus();
} }
vr = 0; ir = 0;
}; };
return [ N, or, O.bind(0, nr) ]; return [ Z, ur, O.bind(0, tr) ];
}; };
var Ie = function createTrinsicUpdateSegment(r, a) { var Ie = function createTrinsicUpdateSegment(r, a) {
var e = r.ar; var e = r.ar;
@@ -2391,7 +2394,7 @@ var OverlayScrollbars = function(r) {
var yn = function createScrollbarsSetupEvents(r, a) { var yn = function createScrollbarsSetupEvents(r, a) {
return function(e, n, t, v, i, o) { return function(e, n, t, v, i, o) {
var u = e.Wr; var u = e.Wr;
var f = Cr(500), l = f[0], c = f[1]; var f = Cr(333), l = f[0], c = f[1];
var s = !!i.scrollBy; var s = !!i.scrollBy;
var d = true; var d = true;
return O.bind(0, [ Nr(u, "pointerenter", (function() { return O.bind(0, [ Nr(u, "pointerenter", (function() {
packages/overlayscrollbars/dist/browser/overlayscrollbars.browser.es5.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
packages/overlayscrollbars/dist/browser/overlayscrollbars.browser.es5.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
packages/overlayscrollbars/dist/browser/overlayscrollbars.browser.es6.js
Vendored
+44 -41
View File
@@ -1101,8 +1101,9 @@ const OverlayScrollbars = function(t) {
const C = $(Et, i, v); const C = $(Et, i, v);
const T = C === p; const T = C === p;
const z = T && m; const z = T && m;
const I = !T && S.top === S && y.activeElement === p; const I = y.activeElement;
const M = { const M = !T && S.top === S && I === p;
const R = {
W: p, W: p,
J: b ? $(Et, l, h) : p, J: b ? $(Et, l, h) : p,
K: C, K: C,
@@ -1120,70 +1121,72 @@ const OverlayScrollbars = function(t) {
ut: (t, n) => T ? hasAttrClass(C, O, n) : hasClass(C, t), ut: (t, n) => T ? hasAttrClass(C, O, n) : hasClass(C, t),
dt: (t, n, o) => T ? attrClass(C, O, n, o) : (o ? addClass : removeClass)(C, t) dt: (t, n, o) => T ? attrClass(C, O, n, o) : (o ? addClass : removeClass)(C, t)
}; };
const R = keys(M).reduce(((t, n) => { const k = keys(R).reduce(((t, n) => {
const o = M[n]; const o = R[n];
return push(t, o && !parent(o) ? o : false); return push(t, o && !parent(o) ? o : false);
}), []); }), []);
const elementIsGenerated = t => t ? indexOf(R, t) > -1 : null; const elementIsGenerated = t => t ? indexOf(k, t) > -1 : null;
const {W: k, J: B, Z: V, K: j, tt: Y, nt: q} = M; const {W: B, J: V, Z: j, K: Y, tt: q, nt: F} = R;
const F = []; const G = [];
const G = b && elementIsGenerated(B); const N = b && elementIsGenerated(V);
let N = b ? k : contents([ Y, j, V, B, k ].find((t => false === elementIsGenerated(t)))); let X = b ? B : contents([ q, Y, j, V, B ].find((t => false === elementIsGenerated(t))));
const X = Y || j; const U = q || Y;
const appendElements = () => { const appendElements = () => {
const t = addDataAttrHost(B, T ? "viewport" : "host"); const t = addDataAttrHost(V, T ? "viewport" : "host");
const n = addClass(V, L); const n = addClass(j, L);
const o = addClass(j, !T && H); const o = addClass(Y, !T && H);
const e = addClass(Y, P); const e = addClass(q, P);
const c = m ? addClass(parent(p), D) : noop; const c = m ? addClass(parent(p), D) : noop;
if (G) { if (N) {
insertAfter(k, B); insertAfter(B, V);
push(F, (() => { push(G, (() => {
insertAfter(B, k); insertAfter(V, B);
removeElements(B); removeElements(V);
})); }));
} }
appendChildren(X, N); appendChildren(U, X);
appendChildren(B, V); appendChildren(V, j);
appendChildren(V || B, !T && j); appendChildren(j || V, !T && Y);
appendChildren(j, Y); appendChildren(Y, q);
push(F, (() => { push(G, (() => {
c(); c();
t(); t();
removeAttr(j, E); removeAttr(Y, E);
removeAttr(j, A); removeAttr(Y, A);
if (elementIsGenerated(q)) {
unwrap(q);
}
if (elementIsGenerated(Y)) { if (elementIsGenerated(Y)) {
unwrap(Y); unwrap(Y);
} }
if (elementIsGenerated(j)) { if (elementIsGenerated(j)) {
unwrap(j); unwrap(j);
} }
if (elementIsGenerated(V)) {
unwrap(V);
}
n(); n();
o(); o();
e(); e();
})); }));
if (s && !T) { if (s && !T) {
push(F, removeClass.bind(0, j, D)); push(G, removeClass.bind(0, Y, D));
} }
if (q) { if (F) {
insertBefore(j, q); insertBefore(Y, F);
push(F, removeElements.bind(0, q)); push(G, removeElements.bind(0, F));
} }
if (I) { if (M) {
const t = attr(j, Ot); const t = attr(Y, Ot);
attr(j, Ot, "-1"); attr(Y, Ot, "-1");
j.focus(); Y.focus();
const n = on(y, "pointerdown keydown", (() => { const n = on(y, "pointerdown keydown", (() => {
t ? attr(j, Ot, t) : removeAttr(j, Ot); t ? attr(Y, Ot, t) : removeAttr(Y, Ot);
n(); n();
})); }));
} else if (I && I.focus) {
I.focus();
} }
N = 0; X = 0;
}; };
return [ M, appendElements, runEachAndClear.bind(0, F) ]; return [ R, appendElements, runEachAndClear.bind(0, G) ];
}; };
const createTrinsicUpdateSegment = (t, n) => { const createTrinsicUpdateSegment = (t, n) => {
const {tt: o} = t; const {tt: o} = t;
@@ -2129,7 +2132,7 @@ const OverlayScrollbars = function(t) {
}; };
const createScrollbarsSetupEvents = (t, n) => (o, s, e, c, r, l) => { const createScrollbarsSetupEvents = (t, n) => (o, s, e, c, r, l) => {
const {Gt: i} = o; const {Gt: i} = o;
const [a, u] = selfCancelTimeout(500); const [a, u] = selfCancelTimeout(333);
const d = !!r.scrollBy; const d = !!r.scrollBy;
let f = true; let f = true;
return runEachAndClear.bind(0, [ on(i, "pointerenter", (() => { return runEachAndClear.bind(0, [ on(i, "pointerenter", (() => {
packages/overlayscrollbars/dist/browser/overlayscrollbars.browser.es6.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
packages/overlayscrollbars/dist/browser/overlayscrollbars.browser.es6.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
packages/overlayscrollbars/dist/overlayscrollbars.cjs.js
Vendored
+44 -41
View File
@@ -1297,8 +1297,9 @@ const createStructureSetupElements = t => {
const A = x(Ot, i, v); const A = x(Ot, i, v);
const T = A === p; const T = A === p;
const z = T && m; const z = T && m;
const H = !T && S.top === S && y.activeElement === p; const H = y.activeElement;
const D = { const D = !T && S.top === S && H === p;
const R = {
J: p, J: p,
K: b ? x(Ot, l, h) : p, K: b ? x(Ot, l, h) : p,
Z: A, Z: A,
@@ -1316,70 +1317,72 @@ const createStructureSetupElements = t => {
dt: (t, n) => T ? hasAttrClass(A, C, n) : hasClass(A, t), dt: (t, n) => T ? hasAttrClass(A, C, n) : hasClass(A, t),
ft: (t, n, o) => T ? attrClass(A, C, n, o) : (o ? addClass : removeClass)(A, t) ft: (t, n, o) => T ? attrClass(A, C, n, o) : (o ? addClass : removeClass)(A, t)
}; };
const R = keys(D).reduce(((t, n) => { const k = keys(R).reduce(((t, n) => {
const o = D[n]; const o = R[n];
return push(t, o && !parent(o) ? o : false); return push(t, o && !parent(o) ? o : false);
}), []); }), []);
const elementIsGenerated = t => t ? indexOf(R, t) > -1 : null; const elementIsGenerated = t => t ? indexOf(k, t) > -1 : null;
const {J: k, K: B, tt: V, Z: j, nt: Y, ot: q} = D; const {J: B, K: V, tt: j, Z: Y, nt: q, ot: F} = R;
const F = []; const G = [];
const G = b && elementIsGenerated(B); const N = b && elementIsGenerated(V);
let N = b ? k : contents([ Y, j, V, B, k ].find((t => false === elementIsGenerated(t)))); let X = b ? B : contents([ q, Y, j, V, B ].find((t => false === elementIsGenerated(t))));
const X = Y || j; const U = q || Y;
const appendElements = () => { const appendElements = () => {
const t = addDataAttrHost(B, T ? "viewport" : "host"); const t = addDataAttrHost(V, T ? "viewport" : "host");
const n = addClass(V, I); const n = addClass(j, I);
const o = addClass(j, !T && L); const o = addClass(Y, !T && L);
const e = addClass(Y, M); const e = addClass(q, M);
const c = m ? addClass(parent(p), P) : noop; const c = m ? addClass(parent(p), P) : noop;
if (G) { if (N) {
insertAfter(k, B); insertAfter(B, V);
push(F, (() => { push(G, (() => {
insertAfter(B, k); insertAfter(V, B);
removeElements(B); removeElements(V);
})); }));
} }
appendChildren(X, N); appendChildren(U, X);
appendChildren(B, V); appendChildren(V, j);
appendChildren(V || B, !T && j); appendChildren(j || V, !T && Y);
appendChildren(j, Y); appendChildren(Y, q);
push(F, (() => { push(G, (() => {
c(); c();
t(); t();
removeAttr(j, O); removeAttr(Y, O);
removeAttr(j, E); removeAttr(Y, E);
if (elementIsGenerated(q)) {
unwrap(q);
}
if (elementIsGenerated(Y)) { if (elementIsGenerated(Y)) {
unwrap(Y); unwrap(Y);
} }
if (elementIsGenerated(j)) { if (elementIsGenerated(j)) {
unwrap(j); unwrap(j);
} }
if (elementIsGenerated(V)) {
unwrap(V);
}
n(); n();
o(); o();
e(); e();
})); }));
if (s && !T) { if (s && !T) {
push(F, removeClass.bind(0, j, P)); push(G, removeClass.bind(0, Y, P));
} }
if (q) { if (F) {
insertBefore(j, q); insertBefore(Y, F);
push(F, removeElements.bind(0, q)); push(G, removeElements.bind(0, F));
} }
if (H) { if (D) {
const t = attr(j, Ct); const t = attr(Y, Ct);
attr(j, Ct, "-1"); attr(Y, Ct, "-1");
j.focus(); Y.focus();
const n = on(y, "pointerdown keydown", (() => { const n = on(y, "pointerdown keydown", (() => {
t ? attr(j, Ct, t) : removeAttr(j, Ct); t ? attr(Y, Ct, t) : removeAttr(Y, Ct);
n(); n();
})); }));
} else if (H && H.focus) {
H.focus();
} }
N = 0; X = 0;
}; };
return [ D, appendElements, runEachAndClear.bind(0, F) ]; return [ R, appendElements, runEachAndClear.bind(0, G) ];
}; };
const createTrinsicUpdateSegment = (t, n) => { const createTrinsicUpdateSegment = (t, n) => {
@@ -2363,7 +2366,7 @@ const createDragScrollingEvents = (t, n, o, s, e, c) => {
const createScrollbarsSetupEvents = (t, n) => (o, s, e, c, r, l) => { const createScrollbarsSetupEvents = (t, n) => (o, s, e, c, r, l) => {
const {Nt: i} = o; const {Nt: i} = o;
const [a, u] = selfCancelTimeout(500); const [a, u] = selfCancelTimeout(333);
const d = !!r.scrollBy; const d = !!r.scrollBy;
let f = true; let f = true;
return runEachAndClear.bind(0, [ on(i, "pointerenter", (() => { return runEachAndClear.bind(0, [ on(i, "pointerenter", (() => {
packages/overlayscrollbars/dist/overlayscrollbars.cjs.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
packages/overlayscrollbars/dist/overlayscrollbars.cjs.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
packages/overlayscrollbars/dist/overlayscrollbars.esm.js
Vendored
+44 -41
View File
@@ -1286,8 +1286,9 @@ const createStructureSetupElements = t => {
const A = x(Ot, i, v); const A = x(Ot, i, v);
const T = A === p; const T = A === p;
const z = T && m; const z = T && m;
const H = !T && S.top === S && y.activeElement === p; const H = y.activeElement;
const M = { const M = !T && S.top === S && H === p;
const R = {
W: p, W: p,
J: b ? x(Ot, l, h) : p, J: b ? x(Ot, l, h) : p,
K: A, K: A,
@@ -1305,70 +1306,72 @@ const createStructureSetupElements = t => {
ut: (t, n) => T ? hasAttrClass(A, C, n) : hasClass(A, t), ut: (t, n) => T ? hasAttrClass(A, C, n) : hasClass(A, t),
dt: (t, n, o) => T ? attrClass(A, C, n, o) : (o ? addClass : removeClass)(A, t) dt: (t, n, o) => T ? attrClass(A, C, n, o) : (o ? addClass : removeClass)(A, t)
}; };
const R = keys(M).reduce(((t, n) => { const k = keys(R).reduce(((t, n) => {
const o = M[n]; const o = R[n];
return push(t, o && !parent(o) ? o : false); return push(t, o && !parent(o) ? o : false);
}), []); }), []);
const elementIsGenerated = t => t ? indexOf(R, t) > -1 : null; const elementIsGenerated = t => t ? indexOf(k, t) > -1 : null;
const {W: k, J: B, Z: V, K: Y, tt: j, nt: q} = M; const {W: B, J: V, Z: Y, K: j, tt: q, nt: F} = R;
const F = []; const G = [];
const G = b && elementIsGenerated(B); const N = b && elementIsGenerated(V);
let N = b ? k : contents([ j, Y, V, B, k ].find((t => false === elementIsGenerated(t)))); let X = b ? B : contents([ q, j, Y, V, B ].find((t => false === elementIsGenerated(t))));
const X = j || Y; const U = q || j;
const appendElements = () => { const appendElements = () => {
const t = addDataAttrHost(B, T ? "viewport" : "host"); const t = addDataAttrHost(V, T ? "viewport" : "host");
const n = addClass(V, I); const n = addClass(Y, I);
const o = addClass(Y, !T && L); const o = addClass(j, !T && L);
const e = addClass(j, P); const e = addClass(q, P);
const c = m ? addClass(parent(p), D) : noop; const c = m ? addClass(parent(p), D) : noop;
if (G) { if (N) {
insertAfter(k, B); insertAfter(B, V);
push(F, (() => { push(G, (() => {
insertAfter(B, k); insertAfter(V, B);
removeElements(B); removeElements(V);
})); }));
} }
appendChildren(X, N); appendChildren(U, X);
appendChildren(B, V); appendChildren(V, Y);
appendChildren(V || B, !T && Y); appendChildren(Y || V, !T && j);
appendChildren(Y, j); appendChildren(j, q);
push(F, (() => { push(G, (() => {
c(); c();
t(); t();
removeAttr(Y, O); removeAttr(j, O);
removeAttr(Y, E); removeAttr(j, E);
if (elementIsGenerated(q)) {
unwrap(q);
}
if (elementIsGenerated(j)) { if (elementIsGenerated(j)) {
unwrap(j); unwrap(j);
} }
if (elementIsGenerated(Y)) { if (elementIsGenerated(Y)) {
unwrap(Y); unwrap(Y);
} }
if (elementIsGenerated(V)) {
unwrap(V);
}
n(); n();
o(); o();
e(); e();
})); }));
if (s && !T) { if (s && !T) {
push(F, removeClass.bind(0, Y, D)); push(G, removeClass.bind(0, j, D));
} }
if (q) { if (F) {
insertBefore(Y, q); insertBefore(j, F);
push(F, removeElements.bind(0, q)); push(G, removeElements.bind(0, F));
} }
if (H) { if (M) {
const t = attr(Y, Ct); const t = attr(j, Ct);
attr(Y, Ct, "-1"); attr(j, Ct, "-1");
Y.focus(); j.focus();
const n = on(y, "pointerdown keydown", (() => { const n = on(y, "pointerdown keydown", (() => {
t ? attr(Y, Ct, t) : removeAttr(Y, Ct); t ? attr(j, Ct, t) : removeAttr(j, Ct);
n(); n();
})); }));
} else if (H && H.focus) {
H.focus();
} }
N = 0; X = 0;
}; };
return [ M, appendElements, runEachAndClear.bind(0, F) ]; return [ R, appendElements, runEachAndClear.bind(0, G) ];
}; };
const createTrinsicUpdateSegment = (t, n) => { const createTrinsicUpdateSegment = (t, n) => {
@@ -2352,7 +2355,7 @@ const createDragScrollingEvents = (t, n, o, s, e, c) => {
const createScrollbarsSetupEvents = (t, n) => (o, s, e, c, r, l) => { const createScrollbarsSetupEvents = (t, n) => (o, s, e, c, r, l) => {
const {Gt: i} = o; const {Gt: i} = o;
const [a, u] = selfCancelTimeout(500); const [a, u] = selfCancelTimeout(333);
const d = !!r.scrollBy; const d = !!r.scrollBy;
let f = true; let f = true;
return runEachAndClear.bind(0, [ on(i, "pointerenter", (() => { return runEachAndClear.bind(0, [ on(i, "pointerenter", (() => {
packages/overlayscrollbars/dist/overlayscrollbars.esm.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
packages/overlayscrollbars/dist/overlayscrollbars.esm.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
packages/overlayscrollbars/src/setups/scrollbarsSetup/scrollbarsSetup.events.ts
+2 -1
View File
@@ -136,7 +136,7 @@ export const createScrollbarsSetupEvents =
isHorizontal isHorizontal
) => { ) => {
const { _scrollbar } = scrollbarStructure; const { _scrollbar } = scrollbarStructure;
const [wheelTimeout, clearScrollTimeout] = selfCancelTimeout(500); const [wheelTimeout, clearScrollTimeout] = selfCancelTimeout(333);
const scrollByFn = !!scrollOffsetElm.scrollBy; const scrollByFn = !!scrollOffsetElm.scrollBy;
let wheelScrollBy = true; let wheelScrollBy = true;
@@ -153,6 +153,7 @@ export const createScrollbarsSetupEvents =
(wheelEvent: WheelEvent) => { (wheelEvent: WheelEvent) => {
const { deltaX, deltaY, deltaMode } = wheelEvent; const { deltaX, deltaY, deltaMode } = wheelEvent;
// the first wheel event is swallowed, simulate scroll to compensate for it
if (scrollByFn && wheelScrollBy && deltaMode === 0 && parent(_scrollbar) === hostElm) { if (scrollByFn && wheelScrollBy && deltaMode === 0 && parent(_scrollbar) === hostElm) {
scrollOffsetElm.scrollBy({ scrollOffsetElm.scrollBy({
left: deltaX, left: deltaX,
packages/overlayscrollbars/src/setups/structureSetup/structureSetup.elements.ts
+5 -3
View File
@@ -129,8 +129,8 @@ export const createStructureSetupElements = (
); );
const viewportIsTarget = viewportElement === targetElement; const viewportIsTarget = viewportElement === targetElement;
const viewportIsTargetBody = viewportIsTarget && isBody; const viewportIsTargetBody = viewportIsTarget && isBody;
const setFocus = const activeElm = ownerDocument.activeElement;
!viewportIsTarget && wnd.top === wnd && ownerDocument.activeElement === targetElement; const setViewportFocus = !viewportIsTarget && wnd.top === wnd && activeElm === targetElement;
const evaluatedTargetObj: StructureSetupElementsObj = { const evaluatedTargetObj: StructureSetupElementsObj = {
_target: targetElement, _target: targetElement,
_host: isTextarea _host: isTextarea
@@ -241,7 +241,7 @@ export const createStructureSetupElements = (
insertBefore(_viewport, _viewportArrange); insertBefore(_viewport, _viewportArrange);
push(destroyFns, removeElements.bind(0, _viewportArrange)); push(destroyFns, removeElements.bind(0, _viewportArrange));
} }
if (setFocus) { if (setViewportFocus) {
const ogTabindex = attr(_viewport, tabIndexStr); const ogTabindex = attr(_viewport, tabIndexStr);
attr(_viewport, tabIndexStr, '-1'); attr(_viewport, tabIndexStr, '-1');
@@ -251,6 +251,8 @@ export const createStructureSetupElements = (
ogTabindex ? attr(_viewport, tabIndexStr, ogTabindex) : removeAttr(_viewport, tabIndexStr); ogTabindex ? attr(_viewport, tabIndexStr, ogTabindex) : removeAttr(_viewport, tabIndexStr);
off(); off();
}); });
} else if (activeElm && (activeElm as HTMLElement).focus) {
(activeElm as HTMLElement).focus();
} }
// @ts-ignore // @ts-ignore