feat(LayerManager): add type to layer (#1018)

gravity-ui · Sep 19, 2023 · 3fb7de9 · 3fb7de9
1 parent bafed78
commit 3fb7de9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/src/components/Modal/Modal.tsx b/src/components/Modal/Modal.tsx
@@ -95,6 +95,7 @@ export function Modal({
         onOutsideClick,
         onClose,
         contentRefs: [contentRef],
+        type: 'modal',
     });
 
     return (

diff --git a/src/components/Popup/Popup.tsx b/src/components/Popup/Popup.tsx
@@ -92,6 +92,7 @@ export function Popup({
         onClose,
         contentRefs: [anchorRef, containerRef],
         enabled: !disableLayer,
+        type: 'popup',
     });
 
     const {attributes, styles, setPopperRef, setArrowRef} = usePopper({

diff --git a/src/components/utils/LayerManager.ts b/src/components/utils/LayerManager.ts
@@ -13,6 +13,7 @@ export interface LayerExtendableProps {
     onEnterKeyDown?: (event: KeyboardEvent) => void;
     onOutsideClick?: (event: MouseEvent) => void;
     onClose?: (event: MouseEvent | KeyboardEvent, reason: LayerCloseReason) => void;
+    type?: string;
 }
 
 export type ContentElement =
@@ -52,6 +53,10 @@ class LayerManager {
         return this.stack.length;
     }
 
+    getLayers() {
+        return this.stack.map(({type}) => ({type}));
+    }
+
     private addListeners() {
         document.addEventListener('keydown', this.handleDocumentKeyDown);
         document.addEventListener('click', this.handleDocumentClick, true);
@@ -69,7 +74,11 @@ class LayerManager {
             componentId: 'LayerManager',
             eventId: 'layerschange',
             meta: {
+                /**
+                 * @deprecated use layers
+                 */
                 layersCount: this.getLayersCount(),
+                layers: this.getLayers(),
             },
         });
     }

diff --git a/src/components/utils/useLayer.ts b/src/components/utils/useLayer.ts
@@ -20,6 +20,7 @@ export function useLayer({
     onClose,
     contentRefs,
     enabled = true,
+    type,
 }: LayerProps) {
     const layerConfigRef = React.useRef<LayerConfig>({
         disableEscapeKeyDown,
@@ -29,6 +30,7 @@ export function useLayer({
         onOutsideClick,
         onClose,
         contentRefs,
+        type,
     });
 
     React.useEffect(() => {