Merge branch 'main' into feat/color-field

Author: jonatan-reto

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@genexus/chameleon-controls-library",
-  "version": "6.23.0",
+  "version": "6.25.0",
   "description": "chameleon - A library of white-label, highly-customizable and reusable web components",
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",
@@ -17,8 +17,9 @@
     "loader/"
   ],
   "scripts": {
-    "build": "npm run build.monaco && npm run build.light && npm run build.extras",
+    "build": "npm run build.monaco && npm run build.light && npm run build.extras && npm run build.showcase",
     "build.light": "stencil build --docs --react",
+    "build.showcase": "stencil build",
     "build.extras": "tsc --project tsconfig-collection.json && node copy-files.mjs",
     "build.monaco": "vite build",
     "generate": "stencil generate",
@@ -78,7 +79,7 @@
     "vite": "^5.2.10"
   },
   "peerDependencies": {
-    "lit": "^3.3.0"
+    "lit": "^3.3.1"
   },
   "husky": {
     "hooks": {

package.json

@@ -29,7 +29,7 @@ import { GxImageMultiStateStart } from "../../common/types";
 import { isMobileDevice, tokenMap } from "../../common/utils";
 import { ChPopoverCustomEvent, GxImageMultiState } from "../../components";
 import { focusComposedPath } from "../common/helpers";
-import { ChPopoverAlign } from "../popover/types";
+import { ChPopoverAlign, PopoverClosedInfo } from "../popover/types";
 import { filterSubModel } from "./helpers";
 import { computeComboBoxItemImage, getComboBoxImages } from "./item-images";
 import { findNextSelectedIndex, findSelectedIndex } from "./navigation";
@@ -679,7 +679,7 @@ export class ChComboBoxRender
     }
   };
 
-  #handlePopoverClose = (event: ChPopoverCustomEvent<any>) => {
+  #handlePopoverClose = (event: ChPopoverCustomEvent<PopoverClosedInfo>) => {
     event.stopPropagation();
 
     // The focus must return to the Host when the popover is closed using the
@@ -692,8 +692,13 @@ export class ChComboBoxRender
     // in the ch-popover
 
     // Return the focus to the control if the popover was closed with the
-    // escape key or by clicking again the combo-box
-    if (focusComposedPath().includes(this.el)) {
+    // escape key or by clicking again the combo-box. Don't return the focus if
+    // the popover was closed because it is no longer visible, because it will
+    // provoke a layout shift
+    if (
+      event.detail.reason !== "popover-no-longer-visible" &&
+      focusComposedPath().includes(this.el)
+    ) {
       this.#shouldFocusTheComboBox = true;
     }
 

src/components/combo-box/combo-box.tsx

@@ -0,0 +1,16 @@
+/**
+ * Gets the width and height of the document's viewport.
+ * This uses the `window.innerWidth` and `window.innerHeight` properties to get
+ * the current size of the viewport. These values represent the width and
+ * height of the visible area, excluding any scrollbars.
+ *
+ * IMPORTANT: This function must not use `getBoundingClientRect` or similar
+ * methods that depend on the DOM layout, and not in the actual viewport size.
+ *
+ * @returns An object containing the width and height of the document's
+ * viewport.
+ */
+export const getDocumentSizes = () => ({
+  width: window.innerWidth,
+  height: window.innerHeight
+});

src/components/popover/get-document-sizes.ts

@@ -19,11 +19,13 @@ import {
   subscribeToRTLChanges,
   unsubscribeToRTLChanges
 } from "../../common/utils";
+import { getDocumentSizes } from "./get-document-sizes";
 import {
   ChPopoverAlign,
   ChPopoverResizeElement,
   ChPopoverSizeMatch,
-  PopoverActionElement
+  PopoverActionElement,
+  PopoverClosedInfo
 } from "./types";
 import { fromPxToNumber, setResponsiveAlignment } from "./utils";
 
@@ -506,8 +508,26 @@ export class ChPopover {
    *
    * This event can be prevented (`preventDefault()`), interrupting the
    * `ch-popover`'s closing.
+   *
+   * The `reason` property of the event provides more information about
+   * the cause of the closing:
+   *  - `"click-outside"`: The popover is being closed because the user clicked
+   *    outside the popover when using `closeOnClickOutside === true` and
+   *    `mode === "manual"`.
+   *
+   *  - `"escape-key"`: The popover is being closed because the user pressed the
+   *    "Escape" key when using `closeOnClickOutside === true` and
+   *    `mode === "manual"`.
+   *
+   *  - `"popover-no-longer-visible"`: The popover is being closed because it
+   *    is no longer visible.
+   *
+   *  - `"toggle"`: The popover is being closed by the native toggle behavior
+   *    of popover. It can be produced by the user clicking the `actionElement`,
+   *    pressing the "Enter" or "Space" keys on the `actionElement`, pressing
+   *    the "Escape" key or other. Used when `mode === "auto"`.
    */
-  @Event() popoverClosed: EventEmitter;
+  @Event() popoverClosed: EventEmitter<PopoverClosedInfo>;
 
   #showPopover = () => {
     this.el.showPopover();
@@ -520,11 +540,14 @@ export class ChPopover {
   };
 
   // TODO: Add unit tests for this feature
-  #closePopoverIfNotDefaultPrevented = (event: Event) => {
-    const eventInfo = this.popoverClosed.emit();
+  #closePopoverIfNotDefaultPrevented = (
+    reason: PopoverClosedInfo,
+    event?: Event
+  ) => {
+    const eventInfo = this.popoverClosed.emit(reason);
 
     if (eventInfo.defaultPrevented) {
-      event.preventDefault();
+      event?.preventDefault();
       return;
     }
 
@@ -541,13 +564,16 @@ export class ChPopover {
       // determine if the popover should be closed
       !composedPath.includes(this.actionElement)
     ) {
-      this.#closePopoverIfNotDefaultPrevented(event);
+      this.#closePopoverIfNotDefaultPrevented(
+        { reason: "click-outside" },
+        event
+      );
     }
   };
 
   #handlePopoverCloseOnEscapeKey = (event: KeyboardEvent) => {
     if (event.code === KEY_CODES.ESCAPE) {
-      this.#closePopoverIfNotDefaultPrevented(event);
+      this.#closePopoverIfNotDefaultPrevented({ reason: "escape-key" }, event);
     }
   };
 
@@ -664,6 +690,13 @@ export class ChPopover {
         passive: true
       })
     );
+
+    // We must observe the actual viewport size, because observing the
+    // document.body does not work when the browser's window is resized
+    // and the body has scrollbars.
+    // Also, passive mode is not supported in the "resize" event, because this
+    // event can not be prevented
+    window.addEventListener("resize", this.#updatePositionRAF);
   };
 
   #updatePositionRAF = () => {
@@ -672,7 +705,7 @@ export class ChPopover {
 
   #updatePosition = () => {
     // - - - - - - - - - - - - - DOM read operations - - - - - - - - - - - - -
-    const documentRect = document.documentElement.getBoundingClientRect();
+    const documentRect = getDocumentSizes();
     const actionRect = this.actionElement.getBoundingClientRect();
     const popoverScrollSizes = {
       width: this.el.scrollWidth,
@@ -701,15 +734,15 @@ export class ChPopover {
   };
 
   #getActionInlineStartPosition = (
-    documentRect: DOMRect,
+    documentRect: { width: number; height: number },
     actionRect: DOMRect
   ) =>
     this.#isRTLDirection
       ? documentRect.width - (actionRect.left + actionRect.width)
       : actionRect.left;
 
   #setResponsiveAlignment = (
-    documentRect: DOMRect,
+    documentRect: { width: number; height: number },
     actionRect: DOMRect,
     actionInlineStart: number,
     popoverScrollSizes: { width: number; height: number },
@@ -743,13 +776,15 @@ export class ChPopover {
     // TODO: Add e2e tests for this
     try {
       if (maxInlineSizeCustomVarValue.endsWith("px")) {
-        actualPopoverWidth = Number(
-          maxInlineSizeCustomVarValue.replace("px", "").trim()
+        actualPopoverWidth = Math.min(
+          actualPopoverWidth,
+          Number(maxInlineSizeCustomVarValue.replace("px", "").trim())
         );
       }
       if (maxBlockSizeCustomVarValue.endsWith("px")) {
-        actualPopoverHeight = Number(
-          maxBlockSizeCustomVarValue.replace("px", "").trim()
+        actualPopoverHeight = Math.min(
+          actualPopoverHeight,
+          Number(maxBlockSizeCustomVarValue.replace("px", "").trim())
         );
       }
     } catch {
@@ -809,6 +844,17 @@ export class ChPopover {
     // Inline size
     if (inlineOverflow < 0) {
       const newMaxInlineSize = popoverWidth + inlineOverflow;
+
+      // TODO: Add e2e tests for this
+      // TODO: We must implement a property to configure the behavior of these
+      // kinds of situations
+      // Close the popover if it won't be visible.
+      if (newMaxInlineSize <= PRECISION_TO_AVOID_FLOATING_POINT_ERRORS) {
+        return this.#closePopoverIfNotDefaultPrevented({
+          reason: "popover-no-longer-visible"
+        });
+      }
+
       setProperty(this.el, POPOVER_FORCED_MAX_INLINE_SIZE, newMaxInlineSize);
     }
     // Check if the forced inline size is no longer needed
@@ -823,6 +869,17 @@ export class ChPopover {
     // Block size
     if (blockOverflow < 0) {
       const newMaxBlockSize = popoverHeight + blockOverflow;
+
+      // TODO: Add e2e tests for this
+      // TODO: We must implement a property to configure the behavior of these
+      // kinds of situations
+      // Close the popover if it won't be visible.
+      if (newMaxBlockSize <= PRECISION_TO_AVOID_FLOATING_POINT_ERRORS) {
+        return this.#closePopoverIfNotDefaultPrevented({
+          reason: "popover-no-longer-visible"
+        });
+      }
+
       setProperty(this.el, POPOVER_FORCED_MAX_BLOCK_SIZE, newMaxBlockSize);
     }
     // Check if the forced block size is no longer needed
@@ -890,6 +947,7 @@ export class ChPopover {
         capture: true
       })
     );
+    window.removeEventListener("resize", this.#updatePositionRAF);
 
     // Delete references for root nodes to any avoid memory leak
     this.#rootNodes = undefined;
@@ -903,7 +961,18 @@ export class ChPopover {
     if (willBeOpen) {
       eventInfo = this.popoverOpened.emit();
     } else {
-      eventInfo = this.popoverClosed.emit();
+      // If the popover is already closed, don't emit the event again
+      // This can happen when:
+      //  - The "Escape" key is pressed in mode === "manual"
+      //  - The user clicks outside the popover in mode === "manual"
+      //  - The show property is changed to false externally
+      //  - The user scrolls the window and the popover is no longer visible
+      // TODO: Add e2e tests for this
+      if (!this.show) {
+        return;
+      }
+
+      eventInfo = this.popoverClosed.emit({ reason: "toggle" });
     }
 
     // TODO: Add unit tests for this feature
@@ -1215,7 +1284,7 @@ export class ChPopover {
     }
 
     if (this.#adjustAlignment) {
-      const documentRect = document.documentElement.getBoundingClientRect();
+      const documentRect = getDocumentSizes();
       const actionRect = this.actionElement.getBoundingClientRect();
       const popoverScrollSizes = {
         width: this.el.scrollWidth,
@@ -1285,6 +1354,7 @@ export class ChPopover {
             ? this.#handleMouseDown
             : null
         }
+        // TODO: Add beforetoggle listener to properly support preventing the natural toggle
         // TODO: Should we add this event with popover="manual"???
         // TODO: Check if the actionElement is an instance of Button to add this handler
         onToggle={this.#handlePopoverToggle}

src/components/popover/popover.tsx

@@ -30,10 +30,10 @@ relative to an element, but placed on the top layer using `position: fixed`.
 
 ## Events
 
-| Event           | Description                                                                                                                                            | Type               |
-| --------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------ |
-| `popoverClosed` | Emitted when the popover is closed by an user interaction.  This event can be prevented (`preventDefault()`), interrupting the `ch-popover`'s closing. | `CustomEvent<any>` |
-| `popoverOpened` | Emitted when the popover is opened by an user interaction.  This event can be prevented (`preventDefault()`), interrupting the ch-popover's opening.   | `CustomEvent<any>` |
+| Event           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | Type                                                                                                   |
+| --------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ |
+| `popoverClosed` | Emitted when the popover is closed by an user interaction.  This event can be prevented (`preventDefault()`), interrupting the `ch-popover`'s closing.  The `reason` property of the event provides more information about the cause of the closing:  - `"click-outside"`: The popover is being closed because the user clicked    outside the popover when using `closeOnClickOutside === true` and    `mode === "manual"`.   - `"escape-key"`: The popover is being closed because the user pressed the    "Escape" key when using `closeOnClickOutside === true` and    `mode === "manual"`.   - `"popover-no-longer-visible"`: The popover is being closed because it    is no longer visible.   - `"toggle"`: The popover is being closed by the native toggle behavior    of popover. It can be produced by the user clicking the `actionElement`,    pressing the "Enter" or "Space" keys on the `actionElement`, pressing    the "Escape" key or other. Used when `mode === "auto"`. | `CustomEvent<{ reason: "click-outside" \| "escape-key" \| "popover-no-longer-visible" \| "toggle"; }>` |
+| `popoverOpened` | Emitted when the popover is opened by an user interaction.  This event can be prevented (`preventDefault()`), interrupting the ch-popover's opening.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `CustomEvent<any>`                                                                                     |
 
 
 ## Shadow Parts

src/components/popover/readme.md

@@ -23,3 +23,11 @@ export type ChPopoverSizeMatch =
   | "action-element-as-minimum";
 
 export type ChPopoverPositionTry = "flip-block" | "flip-inline" | "none";
+
+export type PopoverClosedInfo = {
+  reason:
+    | "click-outside"
+    | "escape-key"
+    | "popover-no-longer-visible"
+    | "toggle";
+};

src/components/popover/types.ts

@@ -135,7 +135,7 @@ const getAlignmentValue = (
 };
 
 export const setResponsiveAlignment = (
-  documentRect: DOMRect,
+  documentRect: { width: number; height: number },
   actionRect: DOMRect,
   actionInlineStart: number,
   popoverWidth: number,