@orangesk/orange-design-system 2.0.0-beta.36 → 2.0.0-beta.37

package/src/components/Table/tests/Header.unit.test.jsx

@@ -1,7 +1,6 @@
 import { render } from "@testing-library/react";
-
-import TableContext from "../TableContext";
 import { Header } from "../Header.tsx";
+import TableContext from "../TableContext";
 
 describe("rendering Header", () => {
   const headers = [

package/src/components/Table/tests/Row.unit.test.jsx

@@ -1,7 +1,6 @@
 import { render } from "@testing-library/react";
-
-import TableContext from "../TableContext";
 import { Row } from "../Row";
+import TableContext from "../TableContext";
 
 describe("rendering Row", () => {
   const expandrow = {

package/src/components/Table/tests/Rows.unit.test.jsx

@@ -1,7 +1,6 @@
 import { render } from "@testing-library/react";
-
-import TableContext from "../TableContext";
 import { Rows } from "../Rows";
+import TableContext from "../TableContext";
 
 describe("rendering Rows", () => {
   const rows = [

package/src/components/Table/tests/Table.conformance.test.jsx

@@ -1,21 +1,21 @@
 import { render } from "@testing-library/react";
-import { axe } from 'vitest-axe';
+import { axe } from "vitest-axe";
 
 import "../../../../__mocks__/resizeObserverMock";
 import { Table } from "../";
 import {
-  headers,
-  rows,
-  unsortedHeaders,
   ascendingHeaders,
-  descendingHeaders,
-  sortableRows,
   ascendingRowsByDate,
+  descendingHeaders,
   descendingRowsByDate,
   expandableTableRows,
   footer,
+  headers,
+  rows,
   scrollableHeaders,
   scrollableRows,
+  sortableRows,
+  unsortedHeaders,
 } from "../docsData";
 
 const defaultProps = {

package/src/components/Table/tests/Table.unit.test.jsx

@@ -1,4 +1,4 @@
-import { render, fireEvent } from "@testing-library/react";
+import { fireEvent, render } from "@testing-library/react";
 
 import "../../../../__mocks__/resizeObserverMock";
 import { Table } from "../Table";

package/src/components/Tabs/Tabs.tsx

@@ -1,12 +1,12 @@
 "use client";
 
-import React from "react";
 import cx from "classnames";
+import React from "react";
 
 import { useStatic } from "../../utils/hooks";
 import { Tab } from "./Tab";
-import TabsStatic from "./Tabs.static";
 import type { TabPanelProps } from "./TabPanel";
+import TabsStatic from "./Tabs.static";
 
 export const variants = ["standard", "light"] as const;
 

package/src/components/Tabs/index.ts

@@ -1,3 +1,3 @@
-export { Tabs } from "./Tabs";
-export { TabPanel } from "./TabPanel";
 export { Tab } from "./Tab";
+export { TabPanel } from "./TabPanel";
+export { Tabs } from "./Tabs";

package/src/components/Tabs/tests/Tabs.unit.test.jsx

@@ -1,8 +1,7 @@
-import { render, fireEvent, screen } from "@testing-library/react";
+import { fireEvent, render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-
-import { Tabs } from "../Tabs";
 import { TabPanel } from "../TabPanel";
+import { Tabs } from "../Tabs";
 
 const arr = [1, 2, 3, 4];
 

package/src/components/Tag/Tag.tsx

@@ -1,5 +1,5 @@
-import React from "react";
 import cx from "classnames";
+import React from "react";
 import { TagButtonProps } from "./TagButton";
 
 export const colors = [

package/src/components/Tag/TagButton.tsx

@@ -1,5 +1,5 @@
-import React from "react";
 import cx from "classnames";
+import React from "react";
 
 import { Icon } from "@/components/Icon";
 import { CLASS_ROOT } from "./Tag";

package/src/components/Tag/index.ts

@@ -1,3 +1,3 @@
+export type { TagColor, TagSize } from "./Tag";
 export { Tag } from "./Tag";
 export { TagButton } from "./TagButton";
-export type { TagColor, TagSize } from "./Tag";

package/src/components/Tag/tests/Tag.conformance.test.jsx

@@ -1,8 +1,7 @@
 import { render } from "@testing-library/react";
-import { axe } from 'vitest-axe';
-
-import { colors } from "../Tag";
+import { axe } from "vitest-axe";
 import { Tag, TagButton } from "..";
+import { colors } from "../Tag";
 
 const sizes = ["small", "large"];
 

package/src/components/Tag/tests/Tag.unit.test.jsx

@@ -1,8 +1,6 @@
 import { render } from "@testing-library/react";
-
-import { Tag } from "../Tag";
+import { colors, Tag } from "../Tag";
 import { TagButton } from "../TagButton";
-import { colors } from "../Tag";
 
 describe("rendering", () => {
   describe("initial state", () => {

package/src/components/Tag/tests/TagButton.conformance.test.jsx

@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { axe } from 'vitest-axe';
+import { axe } from "vitest-axe";
 
 import { TagButton } from "../TagButton";
 

package/src/components/Tag/tests/TagButton.unit.test.jsx

@@ -1,5 +1,5 @@
+import { fireEvent, render } from "@testing-library/react";
 import React from "react";
-import { render, fireEvent } from "@testing-library/react";
 
 import { TagButton } from "../TagButton";
 

package/src/components/Testimonial/Testimonial.tsx

@@ -1,33 +1,33 @@
-import React from 'react';
-import cx from 'classnames';
+import cx from "classnames";
+import React from "react";
 
 interface TestimonialProps {
   className?: string;
   children?: React.ReactNode;
-  color?: 'default' | 'orange';
+  color?: "default" | "orange";
   isDiv?: boolean;
   [key: string]: any;
 }
 
-const CLASS_ROOT = 'testimonial';
+const CLASS_ROOT = "testimonial";
 
-export const Testimonial: React.FC<TestimonialProps> = ({ 
-  className, 
-  children, 
-  color = 'default', 
-  isDiv = false, 
-  ...other 
+export const Testimonial: React.FC<TestimonialProps> = ({
+  className,
+  children,
+  color = "default",
+  isDiv = false,
+  ...other
 }) => {
-  const Tag = isDiv ? 'div' : 'p';
+  const Tag = isDiv ? "div" : "p";
 
   const classes = cx(
     CLASS_ROOT,
     {
-      [`testimonial--${color}`]: color === 'orange',
+      [`testimonial--${color}`]: color === "orange",
     },
-    className
+    className,
   );
-  
+
   return (
     <Tag className={classes} {...other}>
       {children}
@@ -35,4 +35,4 @@ export const Testimonial: React.FC<TestimonialProps> = ({
   );
 };
 
-Testimonial.displayName = 'Testimonial';
+Testimonial.displayName = "Testimonial";

package/src/components/Testimonial/tests/Testimonial.conformance.test.jsx

@@ -1,17 +1,16 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import { axe } from 'vitest-axe';
+import { render } from "@testing-library/react";
+import { axe } from "vitest-axe";
 
-import { Testimonial } from '../';
+import { Testimonial } from "../";
 
 const example = <Testimonial />;
 
-it('is valid html', () => {
+it("is valid html", () => {
   const { container } = render(example);
   expect(container).toHTMLValidate();
 });
 
-it('is accessible', async () => {
+it("is accessible", async () => {
   const { container } = render(example);
   expect(await axe(container)).toHaveNoViolations();
 });

package/src/components/Testimonial/tests/Testimonial.unit.test.jsx

@@ -1,44 +1,43 @@
-import React from 'react';
-import { render } from '@testing-library/react';
+import { render } from "@testing-library/react";
 
-import { Testimonial } from '../';
+import { Testimonial } from "../";
 
-describe('rendering Testimonial', () => {
-  describe('initial state', () => {
-    it('has default class testimonial', () => {
+describe("rendering Testimonial", () => {
+  describe("initial state", () => {
+    it("has default class testimonial", () => {
       const { getByTestId } = render(<Testimonial data-testid="test-id" />);
-      expect(getByTestId('test-id')).toHaveClass('testimonial');
+      expect(getByTestId("test-id")).toHaveClass("testimonial");
     });
-    it('its rendered as paragraph', () => {
+    it("its rendered as paragraph", () => {
       const { getByTestId } = render(<Testimonial data-testid="test-id" />);
-      expect(getByTestId('test-id').tagName).toBe('P');
+      expect(getByTestId("test-id").tagName).toBe("P");
     });
   });
 
-  describe('passed props', () => {
-    it('renders children', () => {
+  describe("passed props", () => {
+    it("renders children", () => {
       const { getByText } = render(<Testimonial>test</Testimonial>);
-      expect(getByText('test')).toBeInTheDocument();
+      expect(getByText("test")).toBeInTheDocument();
     });
-    it('has additional class when className is set', () => {
+    it("has additional class when className is set", () => {
       const { getByTestId } = render(
-        <Testimonial className="test" data-testid="test-id" />
+        <Testimonial className="test" data-testid="test-id" />,
       );
-      expect(getByTestId('test-id')).toHaveClass('testimonial');
-      expect(getByTestId('test-id')).toHaveClass('test');
+      expect(getByTestId("test-id")).toHaveClass("testimonial");
+      expect(getByTestId("test-id")).toHaveClass("test");
     });
-    it('has additional className testimonial--orange prop color with value orange is passed', () => {
+    it("has additional className testimonial--orange prop color with value orange is passed", () => {
       const { getByTestId } = render(
-        <Testimonial className="test" data-testid="test-id" color="orange" />
+        <Testimonial className="test" data-testid="test-id" color="orange" />,
       );
-      expect(getByTestId('test-id')).toHaveClass('testimonial');
-      expect(getByTestId('test-id')).toHaveClass('testimonial--orange');
+      expect(getByTestId("test-id")).toHaveClass("testimonial");
+      expect(getByTestId("test-id")).toHaveClass("testimonial--orange");
     });
-    it('its rendered as div when isDiv prop is passed', () => {
+    it("its rendered as div when isDiv prop is passed", () => {
       const { getByTestId } = render(
-        <Testimonial data-testid="test-id" isDiv />
+        <Testimonial data-testid="test-id" isDiv />,
       );
-      expect(getByTestId('test-id').tagName).toBe('DIV');
+      expect(getByTestId("test-id").tagName).toBe("DIV");
     });
   });
 });

package/src/components/Tile/Tile.tsx

@@ -1,9 +1,8 @@
-import React, { ReactNode } from "react";
 import cx from "classnames";
-
-import { Image } from "../Image";
+import React, { ReactNode } from "react";
 import { Icon } from "../Icon";
 import { IconProps } from "../Icon/Icon";
+import { Image } from "../Image";
 
 export const tileColors = [
   "surface-primary",

package/src/components/Tile/tests/Tile.conformance.test.jsx

@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { axe } from 'vitest-axe';
+import { axe } from "vitest-axe";
 
 import { Tile } from "../";
 

package/src/components/Tooltip/InfoTooltip.tsx

@@ -1,7 +1,7 @@
 "use client";
 
-import React from "react";
 import cx from "classnames";
+import React from "react";
 
 import { Icon } from "../Icon";
 import { Tooltip, TooltipProps } from "./Tooltip";

package/src/components/Tooltip/Tooltip.static.ts

@@ -1,7 +1,11 @@
-import { createPopper, Instance as PopperInstance, Options as PopperOptions } from '@popperjs/core';
-import { transitionHiddenElement } from '@cloudfour/transition-hidden-element';
+import { transitionHiddenElement } from "@cloudfour/transition-hidden-element";
+import {
+  createPopper,
+  Instance as PopperInstance,
+  Options as PopperOptions,
+} from "@popperjs/core";
 
-import { keys } from '../../utils';
+import { keys } from "../../utils";
 
 export interface TooltipConfig {
   rootContainerSelector: string;
@@ -10,39 +14,39 @@ export interface TooltipConfig {
 }
 
 export const defaultConfig: TooltipConfig = {
-  rootContainerSelector: '#root-tooltips',
+  rootContainerSelector: "#root-tooltips",
   removeDialogOnDestroy: false,
   popperOptions: {
-    placement: 'bottom',
-    strategy: 'absolute',
+    placement: "bottom",
+    strategy: "absolute",
     modifiers: [
       {
-        name: 'arrow',
+        name: "arrow",
         options: {
-          element: '.tooltip__arrow',
+          element: ".tooltip__arrow",
           padding: 10,
         },
       },
       {
-        name: 'eventListeners',
+        name: "eventListeners",
         options: {
           scroll: false,
           resize: false,
         },
       },
       {
-        name: 'flip',
+        name: "flip",
         options: {
-          fallbackPlacements: ['right', 'top', 'auto'],
+          fallbackPlacements: ["right", "top", "auto"],
         },
       },
       {
-        name: 'offset',
+        name: "offset",
         options: {
           offset: ({ placement }: { placement: string }) => {
-            if (placement.includes('start')) {
+            if (placement.includes("start")) {
               return [-10, 0];
-            } else if (placement.includes('end')) {
+            } else if (placement.includes("end")) {
               return [10, 0];
             }
             return [0, 0];
@@ -60,6 +64,8 @@ export default class Tooltip {
   public trigger!: HTMLElement;
   public rootContainer?: HTMLElement | null;
   public transitioner: any;
+  private isOpen = false;
+  private ignoreNextBlur = false;
 
   constructor(element: HTMLElement, config?: Partial<TooltipConfig>) {
     this.element = element;
@@ -75,6 +81,8 @@ export default class Tooltip {
 
     this.handleVisibility = this.handleVisibility.bind(this);
     this.onKeydown = this.onKeydown.bind(this);
+    this.onDialogMouseDown = this.onDialogMouseDown.bind(this);
+    this.onDocumentClick = this.onDocumentClick.bind(this);
 
     (this.element as any).ODS_Tooltip = this;
 
@@ -88,111 +96,136 @@ export default class Tooltip {
   }
 
   wrapLastWordAndButton(): void {
-    if (!this.element.hasAttribute('data-tooltip-keep-with-text')) return;
+    if (!this.element.hasAttribute("data-tooltip-keep-with-text")) return;
     const previousSibling = this.trigger.previousSibling;
     if (!previousSibling || previousSibling.nodeType !== Node.TEXT_NODE) {
-      console.warn('Previous sibling is not a text node.');
+      console.warn("Previous sibling is not a text node.");
       return;
     }
-    const textContent = previousSibling.textContent?.trim() || '';
-    const words = textContent.split(' ');
+    const textContent = previousSibling.textContent?.trim() || "";
+    const words = textContent.split(" ");
     const lastWord = words.pop();
-    const updatedTextContent = words.join(' ');
-    previousSibling.textContent = updatedTextContent + ' ';
-    const span = document.createElement('span');
-    span.className = 'text-nowrap';
+    const updatedTextContent = words.join(" ");
+    previousSibling.textContent = updatedTextContent + " ";
+    const span = document.createElement("span");
+    span.className = "text-nowrap";
     span.innerHTML = `${lastWord} ${this.trigger.outerHTML}`;
     this.trigger.parentNode?.replaceChild(span, this.trigger);
-    this.trigger = span.querySelector('[data-tooltip-trigger]') as HTMLElement;
+    this.trigger = span.querySelector("[data-tooltip-trigger]") as HTMLElement;
   }
 
   private init(): void {
     this.trigger = document.querySelector(
-      `[data-tooltip-trigger][aria-describedby=${this.element.getAttribute('id')}]`
+      `[data-tooltip-trigger][aria-describedby=${this.element.getAttribute("id")}]`,
     ) as HTMLElement;
     if (!this.trigger) {
       console.warn(
-        `tooltip trigger element is not defined and the tooltip cannot be attached. Please provide an element with [aria-describedby=${this.element.getAttribute('id')}]`
+        `tooltip trigger element is not defined and the tooltip cannot be attached. Please provide an element with [aria-describedby=${this.element.getAttribute("id")}]`,
       );
     }
-    if (this.element.hasAttribute('data-tooltip-keep-with-text')) {
+    if (this.element.hasAttribute("data-tooltip-keep-with-text")) {
       this.wrapLastWordAndButton();
     }
-    this.rootContainer = document.querySelector(this.config.rootContainerSelector);
+    this.rootContainer = document.querySelector(
+      this.config.rootContainerSelector,
+    );
     if (this.rootContainer) {
       this.rootContainer.appendChild(this.element);
     } else {
       console.warn(
-        'rootContainer element is not defined. Tooltips will be placed inside content which can affect positioning. Please provide rootContainer element (should be placed outside of main content, usually in end of <body /> tag)'
+        "rootContainer element is not defined. Tooltips will be placed inside content which can affect positioning. Please provide rootContainer element (should be placed outside of main content, usually in end of <body /> tag)",
       );
     }
-    const customPlacement = this.element.getAttribute('data-tooltip-placement');
+    const customPlacement = this.element.getAttribute("data-tooltip-placement");
     if (customPlacement) {
       this.config.popperOptions.placement = customPlacement as any;
     }
     this.instance = createPopper(
       this.trigger,
       this.element,
-      this.config.popperOptions
+      this.config.popperOptions,
     );
     this.transitioner = transitionHiddenElement({
       element: this.element,
-      visibleClass: 'is-visible',
+      visibleClass: "is-visible",
     });
-    this.trigger.addEventListener('mouseenter', this.handleVisibility);
-    this.trigger.addEventListener('mouseleave', this.handleVisibility);
-    this.trigger.addEventListener('focus', this.handleVisibility);
-    this.trigger.addEventListener('blur', this.handleVisibility);
+    this.element.addEventListener("mousedown", this.onDialogMouseDown);
+    this.trigger.addEventListener("click", this.handleVisibility);
+    this.trigger.addEventListener("keydown", this.handleVisibility);
+    this.trigger.addEventListener("blur", this.handleVisibility);
   }
 
-  private handleVisibility(e: Event): void {
-    if (e.type === 'mouseenter' || e.type === 'focus') {
-      this.show();
-    }
-    if (e.type === 'blur') {
-      this.hide();
+  private onDialogMouseDown(): void {
+    this.ignoreNextBlur = true;
+  }
+
+  private onDocumentClick(e: MouseEvent): void {
+    const target = e.target as Node | null;
+
+    if (!target) {
+      return;
     }
-    if (e.type === 'mouseleave') {
-      const shouldClose = this.shouldClose(e as MouseEvent);
-      if (shouldClose) {
-        this.hide();
-      }
+
+    if (this.trigger.contains(target) || this.element.contains(target)) {
+      return;
     }
+
+    this.hide();
   }
 
-  private shouldClose(e: MouseEvent): boolean {
-    const mouseLeftTo = (e as any).relatedreference || (e as any).toElement || (e as any).relatedTarget;
-    const callback = (e2: MouseEvent) => {
-      const mouseLeftTo2 = (e2 as any).relatedreference || (e2 as any).toElement || (e2 as any).relatedTarget;
-      this.element.removeEventListener('mouseleave', callback);
-      if (!this.trigger.contains(mouseLeftTo2)) {
-        this.hide();
+  private handleVisibility(e: Event): void {
+    if (e.type === "click") {
+      this.toggle();
+      return;
+    }
+    if (e.type === "keydown") {
+      this.onKeydown(e as KeyboardEvent);
+      return;
+    }
+    if (e.type === "blur") {
+      if (this.ignoreNextBlur) {
+        this.ignoreNextBlur = false;
+        return;
       }
-    };
-    if (this.element.contains(mouseLeftTo)) {
-      this.element.addEventListener('mouseleave', callback);
-      return false;
+      this.hide();
     }
-    return true;
   }
 
   private onKeydown(e: KeyboardEvent): void {
+    if (
+      (e.key === "Enter" || e.key === " ") &&
+      this.trigger.tagName !== "BUTTON"
+    ) {
+      e.preventDefault();
+      this.toggle();
+      return;
+    }
     if (keys.ESC.includes(e.key)) {
       this.hide();
     }
   }
 
+  private toggle(): void {
+    if (this.isOpen) {
+      this.hide();
+    } else {
+      this.show();
+    }
+  }
+
   public show(): void {
     this.transitioner.show();
-    this.trigger.classList.add('is-active');
+    this.trigger.classList.add("is-active");
+    this.isOpen = true;
     this.instance.forceUpdate();
-    document.addEventListener('keydown', this.onKeydown);
+    document.addEventListener("click", this.onDocumentClick);
   }
 
   public hide(): void {
     this.transitioner.hide();
-    this.trigger.classList.remove('is-active');
-    document.removeEventListener('keydown', this.onKeydown);
+    this.trigger.classList.remove("is-active");
+    this.isOpen = false;
+    document.removeEventListener("click", this.onDocumentClick);
   }
 
   public update(): void {
@@ -200,10 +233,11 @@ export default class Tooltip {
   }
 
   public destroy(): void {
-    this.trigger.removeEventListener('mouseenter', this.handleVisibility);
-    this.trigger.removeEventListener('mouseleave', this.handleVisibility);
-    this.trigger.removeEventListener('focus', this.handleVisibility);
-    this.trigger.removeEventListener('blur', this.handleVisibility);
+    this.element.removeEventListener("mousedown", this.onDialogMouseDown);
+    this.trigger.removeEventListener("click", this.handleVisibility);
+    this.trigger.removeEventListener("keydown", this.handleVisibility);
+    this.trigger.removeEventListener("blur", this.handleVisibility);
+    document.removeEventListener("click", this.onDocumentClick);
     this.instance.destroy();
     (this.element as any).ODS_Tooltip = null;
     if (this.config.removeDialogOnDestroy) {

package/src/components/Tooltip/Tooltip.tsx

@@ -1,10 +1,9 @@
 "use client";
 
-import React from "react";
 import cx from "classnames";
-
-import TooltipStatic from "./Tooltip.static";
+import React from "react";
 import { useHydrationSafeId, useStatic } from "../../utils/hooks";
+import TooltipStatic from "./Tooltip.static";
 
 const CLASS_ROOT = "tooltip";
 

package/src/components/Tooltip/index.ts

@@ -1,2 +1,2 @@
-export { Tooltip } from "./Tooltip";
 export { InfoTooltip } from "./InfoTooltip";
+export { Tooltip } from "./Tooltip";

package/src/components/Tooltip/tests/Tooltip.conformance.test.jsx

@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { axe } from 'vitest-axe';
+import { axe } from "vitest-axe";
 
 import { Button } from "../../Button";
 import { Tooltip } from "../";