diff --git a/local/playwright-tooling/src/playwrightRollup.js b/local/playwright-tooling/src/playwrightRollup.js index 31a9a8e..02f0721 100644 --- a/local/playwright-tooling/src/playwrightRollup.js +++ b/local/playwright-tooling/src/playwrightRollup.js @@ -62,15 +62,15 @@ module.exports = () => { ({ close, url, output } = await createRollupBundle(dirname(file), true, config.quiet)); }); - test.beforeEach(async ({ page, browserName }) => { + test.beforeEach(async ({ page, browserName }, { config }) => { await page.goto(url); - if (browserName === 'chromium') { + if (browserName === 'chromium' && config.quiet) { await page.coverage.startJSCoverage(); } }); - test.afterEach(async ({ page, browserName }, { file }) => { - if (browserName === 'chromium') { + test.afterEach(async ({ page, browserName }, { file, config }) => { + if (browserName === 'chromium' && config.quiet) { const coverage = await page.coverage.stopJSCoverage(); await collectCoverage(originalCwd, dirname(output), coverage, file); } diff --git a/packages/overlayscrollbars/src/instances.ts b/packages/overlayscrollbars/src/instances.ts index b7084f7..2389ec9 100644 --- a/packages/overlayscrollbars/src/instances.ts +++ b/packages/overlayscrollbars/src/instances.ts @@ -1,6 +1,5 @@ import { OverlayScrollbars } from 'overlayscrollbars'; -const targets: Set = new Set(); const targetInstanceMap: WeakMap = new WeakMap(); /** @@ -10,7 +9,6 @@ const targetInstanceMap: WeakMap = new WeakMap(); */ export const addInstance = (target: Element, osInstance: OverlayScrollbars): void => { targetInstanceMap.set(target, osInstance); - targets.add(target); }; /** @@ -19,7 +17,6 @@ export const addInstance = (target: Element, osInstance: OverlayScrollbars): voi */ export const removeInstance = (target: Element): void => { targetInstanceMap.delete(target); - targets.delete(target); }; /** @@ -28,26 +25,3 @@ export const removeInstance = (target: Element): void => { */ export const getInstance = (target: Element): OverlayScrollbars | undefined => targetInstanceMap.get(target); - -/** - * Gets a Map which represents all active OverayScrollbars instances. - * The Key is the element and the value is the instance. - */ -export const allInstances = (): ReadonlyMap => { - const validTargetInstanceMap: Map = new Map(); - - targets.forEach((target: Element) => { - /* istanbul ignore else */ - if (targetInstanceMap.has(target)) { - validTargetInstanceMap.set(target, targetInstanceMap.get(target)!); - } - }); - - targets.clear(); - - validTargetInstanceMap.forEach((instance: OverlayScrollbars, validTarget: Element) => { - targets.add(validTarget); - }); - - return validTargetInstanceMap; -}; diff --git a/packages/overlayscrollbars/src/setups/structureSetup/structureSetup.elements.ts b/packages/overlayscrollbars/src/setups/structureSetup/structureSetup.elements.ts index 6bc1b0d..43c754d 100644 --- a/packages/overlayscrollbars/src/setups/structureSetup/structureSetup.elements.ts +++ b/packages/overlayscrollbars/src/setups/structureSetup/structureSetup.elements.ts @@ -181,7 +181,7 @@ export const createStructureSetupElements = ( const { _target, _host, _padding, _viewport, _content, _viewportArrange } = evaluatedTargetObj; const destroyFns: (() => any)[] = []; const isTextareaHostGenerated = isTextarea && elementIsGenerated(_host); - const targetContents = isTextarea + let targetContents = isTextarea ? _target : contents( [_content, _viewport, _padding, _host, _target].find( @@ -240,6 +240,9 @@ export const createStructureSetupElements = ( insertBefore(_viewport, _viewportArrange); push(destroyFns, removeElements.bind(0, _viewportArrange)); } + + // @ts-ignore + targetContents = 0; }; return [evaluatedTargetObj, appendElements, runEachAndClear.bind(0, destroyFns)]; diff --git a/packages/overlayscrollbars/tests/jest/instances.test.ts b/packages/overlayscrollbars/tests/jest/instances.test.ts index cc29bec..c54c880 100644 --- a/packages/overlayscrollbars/tests/jest/instances.test.ts +++ b/packages/overlayscrollbars/tests/jest/instances.test.ts @@ -1,4 +1,4 @@ -import { addInstance, removeInstance, getInstance, allInstances } from 'instances'; +import { addInstance, removeInstance, getInstance } from 'instances'; import { OverlayScrollbars } from 'overlayscrollbars'; const testElm = document.body; @@ -12,14 +12,14 @@ describe('instances', () => { test('add instance', () => { addInstance(testElm, testInstance); - expect(allInstances().size).toBe(1); + expect(getInstance(testElm)).toBe(testInstance); }); test('remove instance', () => { addInstance(testElm, testInstance); removeInstance(testElm); - expect(allInstances().size).toBe(0); + expect(getInstance(testElm)).toBe(undefined); }); test('get instance', () => {