@economic/taco 2.47.0-server.3 → 2.47.0-server.4

package/dist/taco.cjs.development.js

@@ -4083,10 +4083,10 @@ const Badge = /*#__PURE__*/React.forwardRef(function Badge(props, ref) {
     ...otherProps
   } = props;
   const isTransparent = color === 'transparent';
-  const className = cn('rounded-full border overflow-hidden whitespace-nowrap inline-flex items-center justify-center', {
+  const className = cn('rounded-full border box-border overflow-hidden whitespace-nowrap inline-flex items-center justify-center', {
     [`border ${getOutlineColorShadeClasses(color)}`]: outline,
-    [`border-transparent font-normal ${getSubtleColorShadeClasses(color)}`]: subtle,
-    [`border-transparent ${getColorShadeClasses(color)}`]: !outline && !subtle,
+    [`border-none font-normal ${getSubtleColorShadeClasses(color)}`]: subtle,
+    [`border-none ${getColorShadeClasses(color)}`]: !outline && !subtle,
     'h-4 min-w-0 py-0 px-1 text-xs': small,
     'h-2 w-2 min-w-0': compact,
     'font-bold': outline || !subtle,
@@ -4098,12 +4098,15 @@ const Badge = /*#__PURE__*/React.forwardRef(function Badge(props, ref) {
     if (compact) {
       return /*#__PURE__*/React.createElement(VisuallyHidden, null, children);
     }
+    const contentToRender = typeof children === 'string' ? /*#__PURE__*/React.createElement("span", {
+      className: "items-center truncate"
+    }, children) : children;
     if (status) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-        className: cn('mr-1 h-2 w-2 rounded-full', getColorShadeClasses(color))
-      }), children);
+        className: cn('mr-1 h-2 w-2 shrink-0 rounded-full', getColorShadeClasses(color))
+      }), contentToRender);
     }
-    return children;
+    return contentToRender;
   };
   return /*#__PURE__*/React.createElement("span", Object.assign({}, otherProps, {
     "aria-atomic": "true",
@@ -11362,7 +11365,7 @@ function useTableDataLoader(fetchPage, fetchAll, options = {
   }, invalidate];
 }
 
-function useTableServerLoading(loadPage, loadAll, pages, pageSize = DEFAULT_PAGE_SIZE, _experimentalDataLoader2 = false) {
+function useTableServerLoading(length, loadPage, loadAll, pages, pageSize = DEFAULT_PAGE_SIZE, _experimentalDataLoader2 = false) {
   const isEnabled = !!loadPage && !!loadAll;
   const [isReady, setReady] = React__default.useState(false);
   const [loadAllStatus, setLoadedStatus] = React__default.useState(exports.TableServerLoadAllState.Incomplete);
@@ -11416,6 +11419,7 @@ function useTableServerLoading(loadPage, loadAll, pages, pageSize = DEFAULT_PAGE
       }
     };
   }
+  const pageCount = Math.ceil(length / pageSize);
   return {
     pages,
     isEnabled,
@@ -11425,6 +11429,7 @@ function useTableServerLoading(loadPage, loadAll, pages, pageSize = DEFAULT_PAGE
     loadAllIfNeeded: _loadAllIfNeeded,
     loadAllStatus,
     pageSize,
+    pageCount,
     _experimentalDataLoader2
   };
 }
@@ -11765,7 +11770,7 @@ function useTableManager(props, meta, internalColumns) {
   const rowHeight = useTableRowHeight(options.enableRowHeight, settings.rowHeight);
   const rowSelection = useTableRowSelection(!!options.enableRowSelection);
   const search = useTableSearch(options.enableSearch, props.onChangeSearch, settings.excludeUnmatchedRecordsInSearch);
-  const server = useTableServerLoading(props.loadPage, props.loadAll, props.pages, props.pageSize, props._experimentalDataLoader2);
+  const server = useTableServerLoading(length, props.loadPage, props.loadAll, props.pages, props.pageSize, props._experimentalDataLoader2);
   // TODO: memoise
   // convert jsx column components into valid table columns
   const {
@@ -12126,18 +12131,20 @@ function Row(props) {
       }
       */
       // always load the next page
-      if (scrollDirection === 'forward' || !scrollDirection) {
+      if ((scrollDirection === 'forward' || !scrollDirection) && pageIndex + 2 < tableMeta.server.pageCount) {
         pageIndexesToFetch.push(pageIndex + 1);
       }
-      // the virtualiser fetches a page ahead, so this won't get called in most cases
-      // but it provides a fallback for some edge cases
-      timeout = setTimeout(() => {
-        pageIndexesToFetch.forEach(index => {
-          var _tableMeta$server$loa, _tableMeta$server;
-          // this can be called by every row within the current page, but loadPage returns early if a pending request exists
-          (_tableMeta$server$loa = (_tableMeta$server = tableMeta.server).loadPage) === null || _tableMeta$server$loa === void 0 ? void 0 : _tableMeta$server$loa.call(_tableMeta$server, index, sorting, filters, tableMeta.search.enableGlobalFilter ? search : undefined, hiddenColumns);
-        });
-      }, DELAY_BEFORE_LOAD_MS);
+      if (pageIndexesToFetch.length) {
+        // the virtualiser fetches a page ahead, so this won't get called in most cases
+        // but it provides a fallback for some edge cases
+        timeout = setTimeout(() => {
+          pageIndexesToFetch.forEach(index => {
+            var _tableMeta$server$loa, _tableMeta$server;
+            // this can be called by every row within the current page, but loadPage returns early if a pending request exists
+            (_tableMeta$server$loa = (_tableMeta$server = tableMeta.server).loadPage) === null || _tableMeta$server$loa === void 0 ? void 0 : _tableMeta$server$loa.call(_tableMeta$server, index, sorting, filters, tableMeta.search.enableGlobalFilter ? search : undefined, hiddenColumns);
+          });
+        }, DELAY_BEFORE_LOAD_MS);
+      }
     }
     return () => {
       clearTimeout(timeout);
@@ -14941,14 +14948,16 @@ const Tag$1 = /*#__PURE__*/React__default.forwardRef((props, ref) => {
     ref: ref,
     "data-taco": "tag"
   }), /*#__PURE__*/React__default.createElement("span", {
-    className: "truncate px-2",
+    className: "flex items-center truncate px-2",
     ref: textRef
   }, icon ? typeof icon === 'string' ? (/*#__PURE__*/React__default.createElement(Icon, {
     name: icon,
-    className: "-ml-1 -mt-0.5 mr-1 !h-5 !w-5"
+    className: "-ml-1 mr-1 !h-5 !w-5"
   })) : (/*#__PURE__*/React__default.cloneElement(icon, {
-    className: 'mr-1 -ml-1 -mt-0.5 !h-5 !w-5'
-  })) : null, children), onDelete ? (/*#__PURE__*/React__default.createElement(Icon, {
+    className: 'mr-1 -ml-1 !h-5 !w-5'
+  })) : null, /*#__PURE__*/React__default.createElement("span", {
+    className: "truncate"
+  }, children)), onDelete ? (/*#__PURE__*/React__default.createElement(Icon, {
     name: "close",
     onClick: onDelete,
     className: "-ml-1.5 !h-6 !w-5 flex-shrink-0 cursor-pointer rounded-r p-0.5 hover:bg-black/5"
@@ -15227,12 +15236,13 @@ const Option$1 = /*#__PURE__*/React__default.forwardRef(function Select2Option(p
   }), hasValue ? (/*#__PURE__*/React__default.createElement(Icon, {
     name: "tick",
     className: "pointer-events-none invisible -mx-0.5 !h-4 !w-4 group-aria-selected:visible"
-  })) : null, isTag ? (/*#__PURE__*/React__default.createElement(Tag$1, {
+  })) : null, typeof children !== 'string' ? (/*#__PURE__*/React__default.createElement("span", null, children)) : isTag ? (/*#__PURE__*/React__default.createElement(Tag$1, {
     className: "pointer-events-none my-1",
     color: color,
     icon: prefix
   }, children)) : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, prefix ? typeof prefix === 'string' ? /*#__PURE__*/React__default.createElement(Icon, {
-    name: prefix
+    name: prefix,
+    className: "!h-5 !w-5"
   }) : prefix : null, /*#__PURE__*/React__default.createElement("span", {
     className: "flex w-full justify-between"
   }, /*#__PURE__*/React__default.createElement("span", {
@@ -15241,9 +15251,10 @@ const Option$1 = /*#__PURE__*/React__default.forwardRef(function Select2Option(p
     className: "text-grey-700 -mt-1.5 mb-1.5 text-xs"
   }, description) : null), /*#__PURE__*/React__default.createElement("span", {
     className: "flex flex-col self-center"
-  }, postfix ? typeof postfix === 'string' ? /*#__PURE__*/React__default.createElement(Icon, {
-    name: postfix
-  }) : postfix : null)))), popover ? (/*#__PURE__*/React__default.createElement(IconButton, {
+  }, postfix ? typeof postfix === 'string' ? (/*#__PURE__*/React__default.createElement(Icon, {
+    name: postfix,
+    className: "!h-5 !w-5"
+  })) : postfix : null)))), popover ? (/*#__PURE__*/React__default.createElement(IconButton, {
     icon: "ellipsis-vertical",
     appearance: "discrete",
     className: cn('group-aria-current:visible invisible -mr-1 ml-auto !h-5 min-h-[theme(spacing.6)] !w-5 min-w-[theme(spacing.6)] hover:!bg-black/[.08] focus:!shadow-none group-hover:visible', {
@@ -15409,7 +15420,7 @@ const Single = /*#__PURE__*/React__default.forwardRef(function Select2TriggerSin
     readOnly,
     tags
   } = useSelect2Context();
-  const contentClassName = cn('truncate items-center gap-1');
+  const contentClassName = cn('truncate flex items-center gap-1');
   const currentValue = children.find(matchesValue(value));
   let output;
   if (placeholder && currentValue === undefined) {
@@ -15419,13 +15430,13 @@ const Single = /*#__PURE__*/React__default.forwardRef(function Select2TriggerSin
     }, placeholder);
   } else if (currentValue) {
     if (tags && emptyValue !== value) {
-      output = /*#__PURE__*/React__default.createElement(Tag$1, {
+      if (typeof currentValue.props.children === 'string') output = /*#__PURE__*/React__default.createElement(Tag$1, {
         className: "truncate",
         color: currentValue.props.color,
         disabled: disabled,
         icon: currentValue.props.prefix,
         readOnly: readOnly
-      }, currentValue.props.children);
+      }, currentValue.props.children);else output = currentValue.props.children;
     } else {
       output = /*#__PURE__*/React__default.createElement(React__default.Fragment, null, currentValue.props.prefix ? typeof currentValue.props.prefix === 'string' ? (/*#__PURE__*/React__default.createElement(Icon, {
         name: currentValue.props.prefix,
@@ -15476,7 +15487,7 @@ const Multiple = /*#__PURE__*/React__default.forwardRef(function Select2TriggerM
     }, valuesAsChildren.length === 0 ? (/*#__PURE__*/React__default.createElement(Placeholder, {
       disabled: disabled,
       readOnly: readOnly
-    }, placeholder)) : valuesAsChildren.map(child => (/*#__PURE__*/React__default.createElement(Tag$1, {
+    }, placeholder)) : valuesAsChildren.map(child => typeof child.props.children === 'string' ? (/*#__PURE__*/React__default.createElement(Tag$1, {
       key: String(child.props.value),
       className: "truncate",
       color: tags ? child.props.color : undefined,
@@ -15490,7 +15501,23 @@ const Multiple = /*#__PURE__*/React__default.forwardRef(function Select2TriggerM
         }
       },
       readOnly: readOnly
-    }, child.props.children)))));
+    }, child.props.children)) : (/*#__PURE__*/React__default.cloneElement(child.props.children, {
+      key: String(child.props.value),
+      className: '!pr-0 !pl-1.5',
+      children: (/*#__PURE__*/React__default.createElement("span", {
+        className: "flex items-center"
+      }, child.props.children.props.children, /*#__PURE__*/React__default.createElement(Icon, {
+        name: "close",
+        onClick: event => {
+          event === null || event === void 0 ? void 0 : event.stopPropagation();
+          event === null || event === void 0 ? void 0 : event.preventDefault();
+          if (!disabled && !readOnly) {
+            setValue(child.props.value);
+          }
+        },
+        className: "ml-0.5 !h-5 !w-5 shrink-0 cursor-pointer rounded-r p-0.5 hover:bg-black/5"
+      })))
+    })))));
   } else {
     content = /*#__PURE__*/React__default.createElement(MultipleValue, {
       onClick: forwardClick,
@@ -15521,6 +15548,18 @@ const MultipleValue = ({
   } = useSelect2Context();
   const [contentRef, setContentRef] = React__default.useState(null);
   const boundaryIndex = contentRef ? getIndexOfFirstChildOverflowingParent(contentRef, 30) : undefined;
+  // Retrieves the relevant text content from any JSX.Element passed as a select option, handling nested elements, arrays, and direct text
+  const getTooltipTitle = child => {
+    const children = child.props.children;
+    if (typeof children === 'string') return children;
+    if (typeof children.props.children === 'string') {
+      return children.props.children;
+    }
+    if (Array.isArray(children.props.children)) {
+      return children.props.children.filter(item => typeof item === 'string');
+    }
+    return '';
+  };
   return /*#__PURE__*/React__default.createElement("div", {
     className: "relative flex w-full items-center gap-1 overflow-hidden",
     onClick: onClick
@@ -15531,26 +15570,35 @@ const MultipleValue = ({
     disabled: disabled,
     readOnly: readOnly
   }, placeholder)) : valuesAsChildren.map((child, index) => {
-    const tag = /*#__PURE__*/React__default.createElement(Tag$1, {
-      key: String(child.props.value),
+    const classNames = {
+      truncate: index === boundaryIndex,
+      hidden: boundaryIndex !== undefined && boundaryIndex !== null ? index > boundaryIndex : false
+    };
+    let output;
+    if (typeof child.props.children === 'string') {
+      output = /*#__PURE__*/React__default.createElement(Tag$1, {
+        key: String(child.props.value),
+        className: cn('cursor-pointer', classNames),
+        color: tags ? child.props.color : undefined,
+        disabled: disabled,
+        icon: child.props.prefix,
+        readOnly: readOnly
+      }, child.props.children);
+    } else output = /*#__PURE__*/React__default.cloneElement(child.props.children, {
       className: cn('cursor-pointer', {
-        truncate: index === boundaryIndex,
-        hidden: boundaryIndex !== undefined && boundaryIndex !== null ? index > boundaryIndex : false
-      }),
-      color: tags ? child.props.color : undefined,
-      disabled: disabled,
-      icon: child.props.prefix,
-      readOnly: readOnly
-    }, child.props.children);
+        'shrink-0': index !== boundaryIndex
+      }, classNames),
+      key: String(child.props.value)
+    });
     if (index === boundaryIndex) {
       return /*#__PURE__*/React__default.createElement(Tooltip, {
         key: String(child.props.value),
-        title: String(child.props.children)
-      }, tag);
+        title: String(getTooltipTitle(child))
+      }, output);
     }
-    return tag;
+    return output;
   })), boundaryIndex !== undefined && boundaryIndex !== null && boundaryIndex < valuesAsChildren.length - 1 ? (/*#__PURE__*/React__default.createElement(Tooltip, {
-    title: valuesAsChildren.slice(boundaryIndex + 1).map(child => child ? String(child.props.children) : '').join(', ')
+    title: valuesAsChildren.slice(boundaryIndex + 1).map(child => child ? String(getTooltipTitle(child)) : '').join(', ')
   }, /*#__PURE__*/React__default.createElement(Badge, {
     className: "flex-shrink-0"
   }, "+", valuesAsChildren.length - (boundaryIndex + 1)))) : null);
@@ -16425,10 +16473,11 @@ function guessComparatorsBasedOnControl(column) {
   return getDataTypeProperties(columnMeta.dataType).filterComparators;
 }
 
+const FilterContext = /*#__PURE__*/React__default.createContext([]);
+
 const FilterColumn = /*#__PURE__*/React__default.forwardRef((props, ref) => {
   const {
     allColumns,
-    filters,
     onChange: handleChange,
     value = null,
     ...attributes
@@ -16436,6 +16485,7 @@ const FilterColumn = /*#__PURE__*/React__default.forwardRef((props, ref) => {
   const {
     texts
   } = useLocalization();
+  const filters = React__default.useContext(FilterContext);
   const selectedColumn = allColumns.find(column => column.id === value);
   const warning = selectedColumn && !selectedColumn.getIsVisible();
   return /*#__PURE__*/React__default.createElement("div", {
@@ -16601,6 +16651,7 @@ function Control(props) {
   } = props;
   const controlRenderer = column === null || column === void 0 ? void 0 : (_column$columnDef$met2 = column.columnDef.meta) === null || _column$columnDef$met2 === void 0 ? void 0 : _column$columnDef$met2.control;
   const dataType = column === null || column === void 0 ? void 0 : (_column$columnDef$met3 = column.columnDef.meta) === null || _column$columnDef$met3 === void 0 ? void 0 : _column$columnDef$met3.dataType;
+  const filters = React__default.useContext(FilterContext);
   React.useEffect(() => {
     // Set value to false only after first render of the control (when it's undefined) after setting the FilterColumn value, because we don't want to change then the value every time filter is opened
     if ((controlRenderer === 'switch' || controlRenderer === 'checkbox') && value === undefined) {
@@ -16612,7 +16663,7 @@ function Control(props) {
       ...attributes,
       setValue: value => onChange(value),
       value
-    }), {
+    }, undefined, filters), {
       ['data-query-selector']: querySelector,
       className: 'focus:yt-focus'
     });
@@ -16654,7 +16705,6 @@ function Filter$1(props) {
   const {
     allColumns,
     filter,
-    filters,
     onChange: handleChange,
     onRemove,
     position
@@ -16729,7 +16779,6 @@ function Filter$1(props) {
     className: "flex min-h-[theme(spacing.8)] w-14 flex-shrink-0 items-center justify-end pr-2 text-right"
   }, position > 0 ? texts.table.filters.conditions.and : texts.table.filters.conditions.where), /*#__PURE__*/React__default.createElement(FilterColumn, {
     allColumns: allColumns,
-    filters: filters,
     onChange: handleChangeColumn,
     value: id,
     ref: ref
@@ -16833,7 +16882,9 @@ function ManageFiltersPopover(props) {
   };
   return /*#__PURE__*/React__default.createElement(Popover, Object.assign({}, popoverProps, {
     onChange: handleClose
-  }), /*#__PURE__*/React__default.createElement(Popover.Content, null, /*#__PURE__*/React__default.createElement("div", {
+  }), /*#__PURE__*/React__default.createElement(Popover.Content, null, /*#__PURE__*/React__default.createElement(FilterContext.Provider, {
+    value: filters
+  }, /*#__PURE__*/React__default.createElement("div", {
     className: "flex w-[40rem] flex-col gap-4"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "flex h-8"
@@ -16849,7 +16900,6 @@ function ManageFiltersPopover(props) {
     key: `filter_${index}`,
     allColumns: allColumns,
     filter: filter,
-    filters: filters,
     position: index,
     onChange: handleChangeFilter,
     onRemove: filters.length > 0 && filters.some(f => f.id) || filters.length > 1 ? handleRemoveFilter : undefined
@@ -16865,7 +16915,7 @@ function ManageFiltersPopover(props) {
   }, texts.table.filters.buttons.clear), /*#__PURE__*/React__default.createElement(Button$1, {
     appearance: "primary",
     onClick: handleApply
-  }, texts.table.filters.buttons.apply)))));
+  }, texts.table.filters.buttons.apply))))));
 }
 
 function Filters(props) {
@@ -20329,6 +20379,16 @@ const BaseTable3 = /*#__PURE__*/fixedForwardRef(function BaseTable3(props, ref)
   const hasAlertErrors = table3.meta.editing.getErrorsShownInAlert().length;
   const hasCreateWorkflow = table3.meta.editing.isEnabled && props.onEditingCreate;
   const isScrolled = isTableScrolled(table3.ref);
+  let createWorkflow;
+  if (hasCreateWorkflow) {
+    createWorkflow = /*#__PURE__*/React__default.createElement(CreateNewRow, {
+      buttonRef: table3.meta.editing.createRowButtonRef,
+      isScrolled: isScrolled,
+      scrollToIndex: table3.renderer.scrollToIndex,
+      table: table3.instance,
+      tableMeta: table3.meta
+    });
+  }
   return /*#__PURE__*/React__default.createElement(Table, null, /*#__PURE__*/React__default.createElement(Table.Toolbar, {
     table: table3
   }, table3.meta.editing.isEnabled ? (/*#__PURE__*/React__default.createElement(Editing, {
@@ -20341,13 +20401,7 @@ const BaseTable3 = /*#__PURE__*/fixedForwardRef(function BaseTable3(props, ref)
     tableRef: table3.ref
   })) : null, /*#__PURE__*/React__default.createElement(Table.Grid, Object.assign({}, gridAttributes, {
     "data-taco": "table3",
-    footerRows: hasCreateWorkflow && isScrolled ? (/*#__PURE__*/React__default.createElement(CreateNewRow, {
-      buttonRef: table3.meta.editing.createRowButtonRef,
-      isScrolled: isScrolled,
-      scrollToIndex: table3.renderer.scrollToIndex,
-      table: table3.instance,
-      tableMeta: table3.meta
-    })) : undefined,
+    footerRows: hasCreateWorkflow && isScrolled ? createWorkflow : undefined,
     table: table3
   }), hasCreateWorkflow ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(TemporaryRow, {
     createRowButtonRef: table3.meta.editing.createRowButtonRef,
@@ -20355,13 +20409,7 @@ const BaseTable3 = /*#__PURE__*/fixedForwardRef(function BaseTable3(props, ref)
     table: table3.instance,
     tableMeta: table3.meta,
     tableRef: table3.ref
-  }), !isScrolled ? (/*#__PURE__*/React__default.createElement(CreateNewRow, {
-    buttonRef: table3.meta.editing.createRowButtonRef,
-    isScrolled: isScrolled,
-    scrollToIndex: table3.renderer.scrollToIndex,
-    table: table3.instance,
-    tableMeta: table3.meta
-  })) : null)) : null));
+  }), !isScrolled ? createWorkflow : null)) : null));
 });
 const Table3 = /*#__PURE__*/fixedForwardRef(function Table3(props, ref) {
   const stringifiedChildren = String(props.children);