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

order is matter

Browse Source
This commit is contained in:
Rene
2022-07-27 21:18:38 +02:00
parent 352501f2f1
commit edfdcff024
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/overlayscrollbars/src/observers/sizeObserver.ts
+2 -2
View File
@@ -7,7 +7,6 @@ import {
scrollLeft, scrollLeft,
scrollTop, scrollTop,
runEachAndClear, runEachAndClear,
prependChildren,
removeElements, removeElements,
on, on,
addClass, addClass,
@@ -18,6 +17,7 @@ import {
removeClass, removeClass,
isObject, isObject,
stopPropagation, stopPropagation,
appendChildren,
} from 'support'; } from 'support';
import { getEnvironment } from 'environment'; import { getEnvironment } from 'environment';
import { import {
@@ -211,7 +211,7 @@ export const createSizeObserver = (
); );
} }
prependChildren(target, sizeObserver); appendChildren(target, sizeObserver);
}, },
]; ];
}; };
packages/overlayscrollbars/src/observers/trinsicObserver.ts
+2 -2
View File
@@ -4,11 +4,11 @@ import {
createDiv, createDiv,
offsetSize, offsetSize,
runEachAndClear, runEachAndClear,
prependChildren,
removeElements, removeElements,
createCache, createCache,
push, push,
IntersectionObserverConstructor, IntersectionObserverConstructor,
appendChildren,
} from 'support'; } from 'support';
import { createSizeObserver } from 'observers/sizeObserver'; import { createSizeObserver } from 'observers/sizeObserver';
import { classNameTrinsicObserver } from 'classnames'; import { classNameTrinsicObserver } from 'classnames';
@@ -93,7 +93,7 @@ export const createTrinsicObserver = (
onSizeChanged(); onSizeChanged();
} }
prependChildren(target, trinsicObserver); appendChildren(target, trinsicObserver);
}, },
() => { () => {
if (intersectionObserverInstance) { if (intersectionObserverInstance) {
packages/overlayscrollbars/src/setups/structureSetup/structureSetup.observers.ts
+1
View File
@@ -244,6 +244,7 @@ export const createStructureSetupObservers = (
destroyHostMutationObserver(); destroyHostMutationObserver();
}, },
() => { () => {
// order is matter!
appendSizeObserver(); appendSizeObserver();
appendTrinsicObserver(); appendTrinsicObserver();
}, },
packages/overlayscrollbars/src/setups/structureSetup/structureSetup.ts
+1 -1
View File
@@ -97,8 +97,8 @@ export const createStructureSetup = (
addEvent('u', listener); addEvent('u', listener);
}; };
structureSetupState._appendElements = () => { structureSetupState._appendElements = () => {
appendStructureElements();
appendObserverElements(); appendObserverElements();
appendStructureElements();
}; };
structureSetupState._elements = elements; structureSetupState._elements = elements;
packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.browser.ts
+16 -13
View File
@@ -788,19 +788,22 @@ const start = async () => {
setTestResult(null); setTestResult(null);
target?.removeAttribute('style'); target?.removeAttribute('style');
try {
await overflowTest(); await overflowTest();
await overflowTest({ overflow: { x: 'visible', y: 'visible' } }); await overflowTest({ overflow: { x: 'visible', y: 'visible' } });
await overflowTest({ overflow: { x: 'visible-scroll', y: 'visible-hidden' } }); await overflowTest({ overflow: { x: 'visible-scroll', y: 'visible-hidden' } });
await overflowTest({ overflow: { x: 'visible-hidden', y: 'hidden' } }); await overflowTest({ overflow: { x: 'visible-hidden', y: 'hidden' } });
await overflowTest({ overflow: { x: 'visible', y: 'visible-scroll' } }); await overflowTest({ overflow: { x: 'visible', y: 'visible-scroll' } });
await overflowTest({ overflow: { x: 'scroll', y: 'visible-scroll' } }); await overflowTest({ overflow: { x: 'scroll', y: 'visible-scroll' } });
await overflowTest({ overflow: { x: 'hidden', y: 'scroll' } }); await overflowTest({ overflow: { x: 'hidden', y: 'scroll' } });
await overflowTest({ overflow: { x: 'scroll', y: 'hidden' } }); await overflowTest({ overflow: { x: 'scroll', y: 'hidden' } });
await overflowTest({ overflow: { x: 'visible', y: 'scroll' } }); await overflowTest({ overflow: { x: 'visible', y: 'scroll' } });
await overflowTest({ overflow: { x: 'scroll', y: 'visible' } }); await overflowTest({ overflow: { x: 'scroll', y: 'visible' } });
await overflowTest({ overflow: { x: 'visible', y: 'hidden' } }); await overflowTest({ overflow: { x: 'visible', y: 'hidden' } });
await overflowTest({ overflow: { x: 'hidden', y: 'visible' } }); await overflowTest({ overflow: { x: 'hidden', y: 'visible' } });
} catch (e) {
console.log(e);
}
setTestResult(true); setTestResult(true);
}; };