feat(popover): rm Design pages & use closeSurface methods

Signed-off-by: aurore.stagnol <[email protected]>
ovh · Jun 26, 2023 · 52e75ad · 52e75ad
1 parent bd5f796
commit 52e75ad
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 59 deletions.
diff --git a/packages/design/assets/design-images/popover/popover-preview.png b/packages/design/assets/design-images/popover/popover-preview.png
diff --git a/packages/design/assets/design-images/popover/popover-zoning.png b/packages/design/assets/design-images/popover/popover-zoning.png
diff --git a/packages/design/components/popover/design-popover.mdx b/packages/design/components/popover/design-popover.mdx
diff --git a/packages/libraries/cdk/src/components/surface/ocdk-surface.ts b/packages/libraries/cdk/src/components/surface/ocdk-surface.ts
@@ -248,15 +248,6 @@ export class OcdkSurface extends HTMLElement implements OcdkSurfaceBehaviour {
     this.controller.setOriginCorner(originCorner);
   }
 
-  /**
-   * Check if a click is outside of the surface
-   * @param event - event reference
-   */
-  isClickOutsideSurface(event: Event): boolean {
-    const srcElement = event.composedPath()[0];
-    return this.anchorElement?.contains(event.target as Node) || this.anchorElement?.shadowRoot?.contains(srcElement as Node) || false;
-  }
-
   private getDefaultAdapter() {
     const adapter: OcdkSurfaceAdapter = {
       addClass: (className) => this.classList.add(className),

diff --git a/packages/libraries/core/jest.config.ts b/packages/libraries/core/jest.config.ts
@@ -19,5 +19,4 @@ const args = process.argv.slice(2);
  * ```
  */
 const config: Config.InitialOptions = OdsGetJestConfig({ basePath: '<rootDir>/../../..', stencil: false, args });
-console.log(config);
 export default config;
diff --git a/packages/libraries/core/src/components/popover/popover/ods-popover-controller.ts b/packages/libraries/core/src/components/popover/popover/ods-popover-controller.ts
@@ -47,9 +47,7 @@ export class OdsPopoverController extends OdsComponentController<OdsPopover> {
 
     if(event.key === "Escape") {
       this.logger.log('EscapeKey on trigger');
-      if(this.component.surface) {
-        this.component.surface.opened = false;
-      }
+      this.closeSurface();
     }
   }
 
@@ -59,9 +57,7 @@ export class OdsPopoverController extends OdsComponentController<OdsPopover> {
   handleSurfaceKey(event: KeyboardEvent): void {
     if (event.key === "Escape") {
       this.logger.log('EscapeKey in surface');
-      if(this.component.surface) {
-        this.component.surface.opened = false;
-      }
+      this.closeSurface();
     }
   }
 
@@ -73,7 +69,7 @@ export class OdsPopoverController extends OdsComponentController<OdsPopover> {
       return;
     } else {
       this.logger.log('Click outside component while it is opened');
-      this.component.surface.opened = false;
+      this.closeSurface();
     }
   }
 
@@ -82,7 +78,7 @@ export class OdsPopoverController extends OdsComponentController<OdsPopover> {
    */
   closeSurface(): void {
     if (this.component.surface && this.component.surface.opened) {
-      this.component.surface.opened = false;
+      this.component.surface.close();
     }
   }
 

diff --git a/packages/tools/storybook/stories/components/popover/popover.design.stories.mdx b/packages/tools/storybook/stories/components/popover/popover.design.stories.mdx