Merge branch 'develop' into fix/error-on-kuplist

smeup · Mar 6, 2025 · a7b1c73 · a7b1c73
2 parents fd35cbb + 2c8b266
commit a7b1c73
Show file tree

Hide file tree

Showing 8 changed files with 237 additions and 183 deletions.
diff --git a/packages/ketchup/src/components.d.ts b/packages/ketchup/src/components.d.ts
@@ -721,6 +721,10 @@ export namespace Components {
           * @default true
          */
         "showSelection": boolean;
+        /**
+          * When set to false buttons don't show the text, only the icon if it is present.
+         */
+        "showText": boolean;
         /**
           * Defines the size of the buttons. Available styles are from "extra-small" to "extra-large". Small will be the default
           * @default KupComponentSizing.SMALL
@@ -4560,6 +4564,7 @@ export namespace Components {
           * The density of the rows, defaults at 'medium' and can also be set to 'dense' or 'wide'.
          */
         "density": FCellPadding;
+        "displayMode": ItemsDisplayMode;
         /**
           * Function that gets invoked when a new set of nodes must be loaded as children of a node.  When useDynamicExpansion is set, the tree component will have two different behaviors depending on the value of this prop. 1 - If this prop is set to null, no callback to download data is available:    the component will emit an event requiring the parent to load the children of the given node. 2 - If this prop is set to have a callback, then the component will automatically make requests to load children of    a given node. After the load has been completed, a different event will be fired to alert the parent of the change.
           * @see useDynamicExpansion
@@ -6776,6 +6781,10 @@ declare namespace LocalJSX {
           * @default true
          */
         "showSelection"?: boolean;
+        /**
+          * When set to false buttons don't show the text, only the icon if it is present.
+         */
+        "showText"?: boolean;
         /**
           * Defines the size of the buttons. Available styles are from "extra-small" to "extra-large". Small will be the default
           * @default KupComponentSizing.SMALL
@@ -9989,6 +9998,7 @@ declare namespace LocalJSX {
           * The density of the rows, defaults at 'medium' and can also be set to 'dense' or 'wide'.
          */
         "density"?: FCellPadding;
+        "displayMode"?: ItemsDisplayMode;
         /**
           * Function that gets invoked when a new set of nodes must be loaded as children of a node.  When useDynamicExpansion is set, the tree component will have two different behaviors depending on the value of this prop. 1 - If this prop is set to null, no callback to download data is available:    the component will emit an event requiring the parent to load the children of the given node. 2 - If this prop is set to have a callback, then the component will automatically make requests to load children of    a given node. After the load has been completed, a different event will be fired to alert the parent of the change.
           * @see useDynamicExpansion

diff --git a/packages/ketchup/src/components/kup-button-list/kup-button-list.tsx b/packages/ketchup/src/components/kup-button-list/kup-button-list.tsx
@@ -110,6 +110,10 @@ export class KupButtonList {
      * @default FButtonStyling.RAISED
      */
     @Prop({ reflect: true }) styling: FButtonStyling = FButtonStyling.RAISED;
+    /**
+     * When set to false buttons don't show the text, only the icon if it is present.
+     */
+    @Prop() showText: boolean = true;
 
     /*-------------------------------------------------*/
     /*       I n t e r n a l   V a r i a b l e s       */
@@ -231,7 +235,7 @@ export class KupButtonList {
             iconOff: data.iconOff,
             placeholderIcon: data.placeholderIcon,
             id: data.id,
-            label: data.label,
+            label: this.showText ? data.label : undefined,
             large: data.large,
             neutral: this.rootElement.classList.contains('kup-neutral')
                 ? true
@@ -323,7 +327,7 @@ export class KupButtonList {
             data.placeholderIcon = node.placeholderIcon;
         }
         if (data.label == null) {
-            data.label = node.value;
+            data.label = node.value ? node.value : node.obj?.k;
         }
         data.fullHeight = this.rootElement.classList.contains('kup-full-height')
             ? true

diff --git a/packages/ketchup/src/components/kup-button-list/readme.md b/packages/ketchup/src/components/kup-button-list/readme.md
@@ -14,6 +14,7 @@
 | `data`          | --               | Props of the sub-components.                                                                                         | `KupButtonListNode[]`                                                                                                                                   | `[]`                       |
 | `disabled`      | `disabled`       | When set to true, the sub-components are disabled.                                                                   | `boolean`                                                                                                                                               | `false`                    |
 | `showSelection` | `show-selection` | When set to true, highlights the selected button with the secondary color of KupTheme.                               | `boolean`                                                                                                                                               | `true`                     |
+| `showText`      | `show-text`      | When set to false buttons don't show the text, only the icon if it is present.                                       | `boolean`                                                                                                                                               | `true`                     |
 | `sizing`        | `sizing`         | Defines the size of the buttons. Available styles are from "extra-small" to "extra-large". Small will be the default | `KupComponentSizing.EXTRA_LARGE \| KupComponentSizing.EXTRA_SMALL \| KupComponentSizing.LARGE \| KupComponentSizing.MEDIUM \| KupComponentSizing.SMALL` | `KupComponentSizing.SMALL` |
 | `styling`       | `styling`        | Defines the style of the buttons. Available styles are "outlined" of "flat" (which is the default).                  | `FButtonStyling.FLAT \| FButtonStyling.FLOATING \| FButtonStyling.ICON \| FButtonStyling.OUTLINED \| FButtonStyling.RAISED`                             | `FButtonStyling.RAISED`    |