From dde65bcc19492dc889a59bd34443e5b6bce6e540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Mon, 24 Feb 2025 13:03:16 +0100 Subject: [PATCH 1/5] IBX-8316: Modal for taxonomy entry assignment field displaying not perfectly with page builder --- .../public/js/scripts/helpers/modal.helper.js | 44 +++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js b/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js index 9e6a7f4079..543b9cb964 100644 --- a/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js +++ b/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js @@ -1,14 +1,42 @@ -const controlZIndex = (container) => { +const controlZIndex = (container, listenerContainer, resetedZIndex = 'initial') => { const initialZIndex = container.style.zIndex; - - container.addEventListener('show.bs.modal', () => { - container.style.zIndex = 'initial'; - }); - container.addEventListener('hide.bs.modal', () => { + const finalListenerContainer = listenerContainer ?? container; + const handleShowModal = () => { + container.style.zIndex = resetedZIndex; + }; + const handleCloseModal = () => { container.style.zIndex = initialZIndex; - }); + }; + const removeControlZIndexListeners = () => { + finalListenerContainer.removeEventListener('show.bs.modal', handleShowModal, false); + finalListenerContainer.removeEventListener('hidden.bs.modal', handleCloseModal, false); + + document.body.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-detached')); + }; + + finalListenerContainer.addEventListener('show.bs.modal', handleShowModal, false); + finalListenerContainer.addEventListener('hidden.bs.modal', handleCloseModal, false); document.body.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-attached')); + + return { + removeControlZIndexListeners, + }; +}; + +const controlZIndexBulk = (items) => { + const storedControlZIndex = items.map((item) => { + return controlZIndex(...item); + }); + const removeControlZIndexListeners = () => { + storedControlZIndex.forEach((item) => { + item.removeControlZIndexListeners(); + }); + }; + + return { + removeControlZIndexListeners, + }; }; -export { controlZIndex }; +export { controlZIndex, controlZIndexBulk }; From ed0091ad98a14cc139817509e2ea7fa051bf19aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Wed, 26 Feb 2025 14:43:21 +0100 Subject: [PATCH 2/5] temp --- .../public/js/scripts/helpers/modal.helper.js | 69 +++++++++++-------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js b/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js index 543b9cb964..f8d1ea8457 100644 --- a/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js +++ b/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js @@ -1,42 +1,51 @@ -const controlZIndex = (container, listenerContainer, resetedZIndex = 'initial') => { +const controlZIndex = (container) => { const initialZIndex = container.style.zIndex; - const finalListenerContainer = listenerContainer ?? container; - const handleShowModal = () => { - container.style.zIndex = resetedZIndex; - }; - const handleCloseModal = () => { - container.style.zIndex = initialZIndex; - }; - const removeControlZIndexListeners = () => { - finalListenerContainer.removeEventListener('show.bs.modal', handleShowModal, false); - finalListenerContainer.removeEventListener('hidden.bs.modal', handleCloseModal, false); - - document.body.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-detached')); - }; - finalListenerContainer.addEventListener('show.bs.modal', handleShowModal, false); - finalListenerContainer.addEventListener('hidden.bs.modal', handleCloseModal, false); + container.addEventListener('show.bs.modal', () => { + container.style.zIndex = 'initial'; + }); + container.addEventListener('hide.bs.modal', () => { + container.style.zIndex = initialZIndex; + }); document.body.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-attached')); - - return { - removeControlZIndexListeners, - }; }; -const controlZIndexBulk = (items) => { - const storedControlZIndex = items.map((item) => { - return controlZIndex(...item); - }); +const betterControlZIndex = (containers, listenerContainer, resetedZIndex = 'initial') => { + const listenersAbortController = new AbortController(); + const containersInitialZIndexes = new Map(); const removeControlZIndexListeners = () => { - storedControlZIndex.forEach((item) => { - item.removeControlZIndexListeners(); + listenersAbortController.abort(); + listenerContainer.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-detached')); + } + + containers.forEach((container) => { + containersInitialZIndexes.set(container, container.style.zIndex); + }); + + containers.forEach((container) => { + listenerContainer.addEventListener('show.bs.modal', () => { + container.style.zIndex = resetedZIndex; }); - }; + }); + + // listenerContainer.addEventListener('show.bs.modal', () => { + // containers.forEach((container) => { + // container.style.zIndex = resetedZIndex; + // }); + // }, { signal: listenersAbortController.signal }); + + listenerContainer.addEventListener('hidden.bs.modal', () => { + containers.forEach((container) => { + container.style.zIndex = containersInitialZIndexes.get(container); + }); + }, { signal: listenersAbortController.signal }); + + listenerContainer.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-attached')); return { removeControlZIndexListeners, - }; -}; + } +} -export { controlZIndex, controlZIndexBulk }; +export { controlZIndex, betterControlZIndex }; From 5c0be0611c423fdf901e1c58fa23c54a96747b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Wed, 26 Feb 2025 14:57:00 +0100 Subject: [PATCH 3/5] temp --- .../public/js/scripts/helpers/modal.helper.js | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js b/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js index f8d1ea8457..6c1ffd6050 100644 --- a/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js +++ b/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js @@ -11,7 +11,7 @@ const controlZIndex = (container) => { document.body.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-attached')); }; -const betterControlZIndex = (containers, listenerContainer, resetedZIndex = 'initial') => { +const betterControlZIndex = (items, listenerContainer) => { const listenersAbortController = new AbortController(); const containersInitialZIndexes = new Map(); const removeControlZIndexListeners = () => { @@ -19,24 +19,18 @@ const betterControlZIndex = (containers, listenerContainer, resetedZIndex = 'ini listenerContainer.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-detached')); } - containers.forEach((container) => { + items.forEach(({ container }) => { containersInitialZIndexes.set(container, container.style.zIndex); }); - containers.forEach((container) => { - listenerContainer.addEventListener('show.bs.modal', () => { - container.style.zIndex = resetedZIndex; + listenerContainer.addEventListener('show.bs.modal', () => { + items.forEach(({ container, zIndex = 'initial' }) => { + container.style.zIndex = zIndex; }); - }); - - // listenerContainer.addEventListener('show.bs.modal', () => { - // containers.forEach((container) => { - // container.style.zIndex = resetedZIndex; - // }); - // }, { signal: listenersAbortController.signal }); + }, { signal: listenersAbortController.signal }); listenerContainer.addEventListener('hidden.bs.modal', () => { - containers.forEach((container) => { + items.forEach(({ container }) => { container.style.zIndex = containersInitialZIndexes.get(container); }); }, { signal: listenersAbortController.signal }); From 6c4c7c4db396aa9d4847802651d978d5ffaf8a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Tue, 15 Apr 2025 13:09:16 +0200 Subject: [PATCH 4/5] change names --- .../Resources/public/js/scripts/helpers/modal.helper.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js b/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js index 6c1ffd6050..fff2247795 100644 --- a/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js +++ b/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js @@ -11,10 +11,10 @@ const controlZIndex = (container) => { document.body.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-attached')); }; -const betterControlZIndex = (items, listenerContainer) => { +const controlManyZIndexes = (items, listenerContainer) => { const listenersAbortController = new AbortController(); const containersInitialZIndexes = new Map(); - const removeControlZIndexListeners = () => { + const removeControlManyZIndexesListeners = () => { listenersAbortController.abort(); listenerContainer.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-detached')); } @@ -38,8 +38,8 @@ const betterControlZIndex = (items, listenerContainer) => { listenerContainer.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-attached')); return { - removeControlZIndexListeners, + removeControlManyZIndexesListeners, } } -export { controlZIndex, betterControlZIndex }; +export { controlZIndex, controlManyZIndexes }; From 9523b1d12de8545ba8c17c7d8f59924b58f0d2f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Tue, 15 Apr 2025 13:11:55 +0200 Subject: [PATCH 5/5] linter --- .../public/js/scripts/helpers/modal.helper.js | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js b/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js index fff2247795..3350d9f8b3 100644 --- a/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js +++ b/src/bundle/Resources/public/js/scripts/helpers/modal.helper.js @@ -17,29 +17,37 @@ const controlManyZIndexes = (items, listenerContainer) => { const removeControlManyZIndexesListeners = () => { listenersAbortController.abort(); listenerContainer.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-detached')); - } + }; items.forEach(({ container }) => { containersInitialZIndexes.set(container, container.style.zIndex); }); - listenerContainer.addEventListener('show.bs.modal', () => { - items.forEach(({ container, zIndex = 'initial' }) => { - container.style.zIndex = zIndex; - }); - }, { signal: listenersAbortController.signal }); - - listenerContainer.addEventListener('hidden.bs.modal', () => { - items.forEach(({ container }) => { - container.style.zIndex = containersInitialZIndexes.get(container); - }); - }, { signal: listenersAbortController.signal }); + listenerContainer.addEventListener( + 'show.bs.modal', + () => { + items.forEach(({ container, zIndex = 'initial' }) => { + container.style.zIndex = zIndex; + }); + }, + { signal: listenersAbortController.signal }, + ); + + listenerContainer.addEventListener( + 'hidden.bs.modal', + () => { + items.forEach(({ container }) => { + container.style.zIndex = containersInitialZIndexes.get(container); + }); + }, + { signal: listenersAbortController.signal }, + ); listenerContainer.dispatchEvent(new CustomEvent('ibexa-control-z-index:events-attached')); return { removeControlManyZIndexesListeners, - } -} + }; +}; export { controlZIndex, controlManyZIndexes };