@adaptabletools/adaptable-cjs 23.0.0-canary.1 → 23.0.0-canary.10

package/src/components/ExpressionEditor/ExpressionFunctionDocumentation.js

@@ -4,7 +4,7 @@ exports.ExpressionFunctionDocumentation = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const Tag_1 = require("../Tag");
 const Flex_1 = require("../Flex");
-const signatureClassName = 'twa:m-0 twa:whitespace-pre-wrap twa:bg-primary twa:text-text-on-primary twa:rounded-standard twa:p-1 twa:inline-block';
+const signatureClassName = 'twa:m-0 twa:whitespace-pre-wrap twa:bg-primary twa:text-primary-foreground twa:rounded-standard twa:p-1 twa:inline-block';
 const ExpressionFunctionDocumentation = (props) => {
     return props.expressionFunction ? ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { "data-name": "expression-editor-documentation", className: "twa:my-2 twa:p-2 twa:rounded-standard twa:leading-normal", children: [props.expressionFunction.description && ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:mb-3 twa:font-bold twa:whitespace-pre-wrap", "data-name": "expression-editor-documentation-description", children: props.expressionFunction.description })), props.expressionFunction.signatures && ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { "data-name": "expression-editor-documentation-signatures", children: [(0, jsx_runtime_1.jsx)("b", { children: "Signatures" }), (0, jsx_runtime_1.jsx)("ul", { className: "twa:flex twa:flex-col twa:gap-1", children: props.expressionFunction.signatures.map((signature, index) => ((0, jsx_runtime_1.jsx)("li", { children: (0, jsx_runtime_1.jsx)("pre", { className: signatureClassName, children: signature }) }, index))) })] })), props.expressionFunction.examples && ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { "data-name": "expression-editor-documentation-examples", children: [(0, jsx_runtime_1.jsx)("b", { children: "Examples" }), (0, jsx_runtime_1.jsx)("ul", { className: "twa:flex twa:flex-col twa:gap-1", children: props.expressionFunction.examples.map((example, index) => ((0, jsx_runtime_1.jsx)("li", { children: (0, jsx_runtime_1.jsx)("pre", { className: signatureClassName, children: example }) }, index))) })] })), props.expressionFunction.returnType && ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { "data-name": "expression-editor-documentation-examples", children: [(0, jsx_runtime_1.jsx)("b", { children: "Return Type" }), (0, jsx_runtime_1.jsx)(Tag_1.Tag, { className: "twa:bg-accentlight twa:text-accent twa:ml-3 twa:rounded-full twa:py-1", children: props.expressionFunction.returnType })] }))] })) : null;
 };

package/src/components/ExpressionEditor/QueryBuilder/QueryBuilderInputs.js

@@ -12,7 +12,7 @@ const ColumnSelector_1 = require("../../../View/Components/Selectors/ColumnSelec
 const FieldSelector_1 = require("../../../View/Components/Selectors/FieldSelector");
 const PermittedValuesSelector_1 = require("../../../View/Components/Selectors/PermittedValuesSelector");
 const CheckBox_1 = require("../../CheckBox");
-const DropdownButton_1 = tslib_1.__importDefault(require("../../DropdownButton"));
+const DropdownButton_1 = require("../../DropdownButton");
 const icons_1 = require("../../icons");
 const InputGroup_1 = require("../../InputGroup");
 const QueryBuilder_1 = require("./QueryBuilder");
@@ -185,7 +185,7 @@ const SymbolToIcon = (props) => {
 const ExpressionSelector = (props) => {
     const { getExpressions } = (0, QueryBuilder_1.useQueryBuilderContext)();
     const expressions = props.dataType ? getExpressions(props.dataType) : [];
-    return ((0, jsx_runtime_1.jsx)(DropdownButton_1.default, { "data-id": "expression-selector", "data-value": props.value, variant: "raised", tone: 'accent', columns: ['label'], items: expressions.map((expression) => ({
+    return ((0, jsx_runtime_1.jsx)(DropdownButton_1.NewDropdownButton, { "data-id": "expression-selector", className: "twa:min-h-input", "data-value": props.value, variant: "raised", tone: 'accent', items: expressions.map((expression) => ({
             label: (0, jsx_runtime_1.jsx)(SymbolToIcon, { symbol: (0, mapQlPredicateToExpression_1.getQlPredicateSymbol)(expression) }),
             onClick: () => {
                 if (expression !== props.value) {
@@ -196,7 +196,7 @@ const ExpressionSelector = (props) => {
 };
 exports.ExpressionSelector = ExpressionSelector;
 const CombinatorSelector = (props) => {
-    return ((0, jsx_runtime_1.jsx)(DropdownButton_1.default, { "data-id": "combinator-selector", "data-value": props.value, columns: ['label'], variant: "raised", tone: "accent", items: [
+    return ((0, jsx_runtime_1.jsx)(DropdownButton_1.NewDropdownButton, { className: "twa:min-h-input", "data-id": "combinator-selector", "data-value": props.value, variant: "raised", tone: "accent", items: [
             { label: 'AND', onClick: () => props.onChange('AND') },
             { label: 'OR', onClick: () => props.onChange('OR') },
         ], children: props.value }));

package/src/components/ExpressionEditor/QueryBuilder/QueryPredicateBuilder.js

@@ -5,23 +5,23 @@ const tslib_1 = require("tslib");
 const react_1 = require("react");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const dnd_1 = require("../../dnd");
+const utils_1 = require("../../../lib/utils");
 const predicate_1 = require("../../../parser/src/predicate");
 const adaptableQlUtils_1 = require("../../../Utilities/adaptableQlUtils");
 const booleanExpressionFunctions_1 = require("../../../Utilities/ExpressionFunctions/booleanExpressionFunctions");
 const AdaptableContext_1 = require("../../../View/AdaptableContext");
-const DropdownButton_1 = tslib_1.__importDefault(require("../../DropdownButton"));
+const DropdownButton_1 = require("../../DropdownButton");
 const ErrorBox_1 = tslib_1.__importDefault(require("../../ErrorBox"));
 const icons_1 = require("../../icons");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../SimpleButton"));
 const QueryBuilderInputs_1 = require("./QueryBuilderInputs");
-const utils_1 = require("./utils");
+const utils_2 = require("./utils");
 const Flex_1 = require("../../Flex");
-const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const ITEM_HEIGHT = 36;
 const BASE_CLASS_NAME = 'ab-QueryBuilder-predicate-editor';
 const Handle = (props) => ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: `${BASE_CLASS_NAME}__handle twa:mr-1`, style: { height: ITEM_HEIGHT }, alignItems: "center", ...props, children: (0, jsx_runtime_1.jsx)(icons_1.Icon, { name: "drag" }) }));
 const QueryPredicateButtons = (props) => {
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [!props.hideAdd && ((0, jsx_runtime_1.jsx)(DropdownButton_1.default, { listMinWidth: 150, columns: ['label'], items: [
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [!props.hideAdd && ((0, jsx_runtime_1.jsx)(DropdownButton_1.NewDropdownButton, { items: [
                     { label: 'Condition', onClick: () => props.onNewPredicate('filter') },
                     { label: 'AND / OR Group', onClick: () => props.onNewPredicate('group') },
                 ], variant: "text", children: (0, jsx_runtime_1.jsx)(icons_1.Icon, { name: "plus" }) })), !props.hideDelete && ((0, jsx_runtime_1.jsx)(SimpleButton_1.default, { icon: "delete", variant: "text", onClick: () => {
@@ -42,7 +42,7 @@ const LogicalFunctionEditor = (props) => {
         props.onChange({ ...props.predicate, args: newArgs });
     };
     const getCombinatorEl = (handleProps) => ((0, jsx_runtime_1.jsx)(dnd_1.DragList, { dragListId: props.id, orientation: "vertical", onDrop: handleDrop, onDragProxyMove: dnd_1.defaultDragProxyMove, children: (listDomProps) => {
-            return ((0, jsx_runtime_1.jsxs)("div", { ...listDomProps, className: (0, clsx_1.default)(listDomProps.className), children: [(0, jsx_runtime_1.jsxs)(Flex_1.Flex, { children: [props.isRoot ? null : (0, jsx_runtime_1.jsx)(Handle, { ...handleProps }), (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { className: "twa:flex-1 twa:mb-2", alignItems: "center", height: ITEM_HEIGHT, children: [(0, jsx_runtime_1.jsx)(QueryBuilderInputs_1.CombinatorSelector, { value: props.predicate.operator, onChange: (combinator) => {
+            return ((0, jsx_runtime_1.jsxs)("div", { ...listDomProps, className: (0, utils_1.cn)(listDomProps.className), children: [(0, jsx_runtime_1.jsxs)(Flex_1.Flex, { children: [props.isRoot ? null : (0, jsx_runtime_1.jsx)(Handle, { ...handleProps }), (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { className: "twa:flex-1 twa:mb-2", alignItems: "center", height: ITEM_HEIGHT, children: [(0, jsx_runtime_1.jsx)(QueryBuilderInputs_1.CombinatorSelector, { value: props.predicate.operator, onChange: (combinator) => {
                                             props.onChange({
                                                 ...props.predicate,
                                                 operator: combinator,
@@ -98,7 +98,7 @@ const LogicalFunctionEditor = (props) => {
     }
     return ((0, jsx_runtime_1.jsx)(dnd_1.DragList.DraggableItem, { id: props.id, children: (itemDomProps) => {
             const { onPointerDown, ...restDomProps } = itemDomProps;
-            return ((0, jsx_runtime_1.jsx)("div", { ...restDomProps, className: (0, clsx_1.default)(className, restDomProps.className), children: getCombinatorEl({ onPointerDown }) }));
+            return ((0, jsx_runtime_1.jsx)("div", { ...restDomProps, className: (0, utils_1.cn)(className, restDomProps.className), children: getCombinatorEl({ onPointerDown }) }));
         } }));
 };
 const PrimitiveFunctionEditor = (props) => {
@@ -116,7 +116,7 @@ const PrimitiveFunctionEditor = (props) => {
         }
         if (columnOrField.includes('FIELD')) {
             columnOrFieldId = columnOrField;
-            const fieldValue = (0, utils_1.mapExpressionToFieldValue)(columnOrField);
+            const fieldValue = (0, utils_2.mapExpressionToFieldValue)(columnOrField);
             columnOrFieldDataType = adaptable.api.expressionApi.internalApi.getFieldType(fieldValue);
         }
         else if (columnOrField.includes('[')) {
@@ -127,13 +127,13 @@ const PrimitiveFunctionEditor = (props) => {
         columnInputDataType = (0, adaptableQlUtils_1.mapColumnDataTypeToExpressionFunctionType)(columnOrFieldDataType);
         functionInputInputDataTypes = booleanExpressionFunctions_1.booleanExpressionFunctions[props.predicate.operator]?.inputs;
         restOfFunctionInputDataTypes = functionInputInputDataTypes
-            ? (0, utils_1.getOperatorMatchingInputs)(columnInputDataType, functionInputInputDataTypes)
+            ? (0, utils_2.getOperatorMatchingInputs)(columnInputDataType, functionInputInputDataTypes)
             : [];
     }
     const level = props.id.split('/').length - 1;
     return ((0, jsx_runtime_1.jsx)(dnd_1.DragList.DraggableItem, { id: props.id, children: (itemDomProps) => {
             const { onPointerDown, ...restDomProps } = itemDomProps;
-            return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { ...restDomProps, className: (0, clsx_1.default)(`twa:pb-2 ${BASE_CLASS_NAME} ${BASE_CLASS_NAME}-level-${level} ${BASE_CLASS_NAME}-primitive ${props.lastChild ? `${BASE_CLASS_NAME}--last-child` : ''}`, restDomProps.className), style: { minHeight: ITEM_HEIGHT }, children: [(0, jsx_runtime_1.jsx)(Handle, { onPointerDown: onPointerDown }), (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", style: { height: ITEM_HEIGHT }, className: "twa:gap-0.5 twa:w-full", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { children: (0, jsx_runtime_1.jsx)(QueryBuilderInputs_1.PrimitiveColumnOrFieldSelector, { onChange: (colOrField) => {
+            return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { ...restDomProps, className: (0, utils_1.cn)(`twa:pb-2 ${BASE_CLASS_NAME} ${BASE_CLASS_NAME}-level-${level} ${BASE_CLASS_NAME}-primitive ${props.lastChild ? `${BASE_CLASS_NAME}--last-child` : ''}`, restDomProps.className), style: { minHeight: ITEM_HEIGHT }, children: [(0, jsx_runtime_1.jsx)(Handle, { onPointerDown: onPointerDown }), (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", style: { height: ITEM_HEIGHT }, className: "twa:gap-0.5 twa:w-full", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { children: (0, jsx_runtime_1.jsx)(QueryBuilderInputs_1.PrimitiveColumnOrFieldSelector, { onChange: (colOrField) => {
                                         props.onChange({
                                             ...props.predicate,
                                             args: [colOrField],

package/src/components/ExpressionEditor/index.js

@@ -81,7 +81,7 @@ function ExpressionEditor(props) {
                 }
             }, children: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { className: "twa:flex-1 twa:text-2", flexDirection: "row", "data-name": "expression-editor", style: { minHeight: 0 }, children: [(0, jsx_runtime_1.jsxs)(Flex_1.Flex, { className: "twa:flex-1 twa:pr-2 twa:overflow-auto twa:min-h-0", "data-name": "expression-builder", flexDirection: "column", children: [editorInput, StringExtensions_1.default.IsNotNullOrEmpty(expressionText?.trim()) && ((0, jsx_runtime_1.jsx)(ExpressionFunctionDocumentation_1.ExpressionFunctionDocumentation, { expressionFunction: selectedFunction })), 
                             /* displayed for advanced queries (observable&Aggregation) to give the users a starting point */
-                            StringExtensions_1.default.IsNullOrEmpty(expressionText?.trim()) && renderQueryHints(type), showDocumentationLinks && ((0, jsx_runtime_1.jsxs)(HelpBlock_1.default, { "data-name": "query-documentation", className: "twa:my-2 twa:p-2 twa:text-3", children: [(0, jsx_runtime_1.jsx)(ButtonInfo_1.ButtonInfo, { className: "twa:mr-2", onClick: () => window.open(queryDocumentationLink, '_blank') }), "See documentation for more details and examples"] })), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex-1" }), showNamedQueryStuff && saveAsNamedQueryElement] }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: `${exports.baseClassName}__sidebar twa:pb-2 twa:px-2 twa:overflow-auto twa:h-full twa:w-[280px]`, "data-name": "expression-sidebar", children: (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:h-full twa:p-2 twa:rounded-standard twa:shadow-md twa:bg-defaultbackground twa:text-foreground", children: (0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { className: "twa:h-full", children: [(0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { value: "column", children: "Columns" }), (0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { value: "field", children: "Fields" }), (0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { value: "named-query", children: "Named Queries" }), (0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Content, { className: "twa:flex-1 twa:h-full", children: (0, jsx_runtime_1.jsx)(DataTableEditor_1.DataTableEditor, { type: "column", dataFormatter: (value) => `[${value}]`, fields: queryableColumns.map((column) => ({
+                            StringExtensions_1.default.IsNullOrEmpty(expressionText?.trim()) && renderQueryHints(type), showDocumentationLinks && ((0, jsx_runtime_1.jsxs)(HelpBlock_1.default, { "data-name": "query-documentation", className: "twa:my-2 twa:p-2 twa:text-3", children: [(0, jsx_runtime_1.jsx)(ButtonInfo_1.ButtonInfo, { className: "twa:mr-2", onClick: () => window.open(queryDocumentationLink, '_blank') }), "See documentation for more details and examples"] })), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex-1" }), showNamedQueryStuff && saveAsNamedQueryElement] }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: `${exports.baseClassName}__sidebar twa:pb-2 twa:px-2 twa:overflow-auto twa:h-full twa:w-[280px]`, "data-name": "expression-sidebar", children: (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:h-full twa:p-2 twa:rounded-standard twa:shadow-md twa:bg-background twa:text-foreground", children: (0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { className: "twa:h-full", children: [(0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { value: "column", children: "Columns" }), (0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { value: "field", children: "Fields" }), (0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { value: "named-query", children: "Named Queries" }), (0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Content, { className: "twa:flex-1 twa:h-full", children: (0, jsx_runtime_1.jsx)(DataTableEditor_1.DataTableEditor, { type: "column", dataFormatter: (value) => `[${value}]`, fields: queryableColumns.map((column) => ({
                                                 label: column.friendlyName,
                                                 value: column.columnId,
                                                 dataType: column.dataType,

package/src/components/FieldWrap/index.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
+const utils_1 = require("../../lib/utils");
 const Flex_1 = require("../Flex");
-const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const twUtils_1 = require("../twUtils");
 const FieldWrap = (props) => {
-    return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "row", alignItems: "center", ...props, className: (0, clsx_1.default)('ab-FieldWrap', twUtils_1.targetOwn.focusWithinOutline, props.className) }));
+    return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "row", alignItems: "center", ...props, className: (0, utils_1.cn)('ab-FieldWrap', twUtils_1.targetOwn.focusWithinOutline, props.className) }));
 };
 exports.default = FieldWrap;

package/src/components/Flex.js

@@ -4,8 +4,8 @@ exports.Box = exports.Flex = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
-const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const twMerge_1 = require("../twMerge");
+const utils_1 = require("../lib/utils");
 const ALIGN_ITEMS_MAP = {
     center: 'twa:items-center',
     'flex-start': 'twa:items-start',
@@ -34,7 +34,7 @@ const FLEX_WRAP_MAP = {
 };
 exports.Flex = React.forwardRef((props, ref) => {
     const { className: _, flexDirection, alignItems, justifyContent, flexWrap, as, ...domProps } = props;
-    const className = (0, clsx_1.default)('twa:flex', 'twa:box-border', FLEX_DIRECTION_MAP[flexDirection], ALIGN_ITEMS_MAP[alignItems], JUSTIFY_CONTENT_MAP[justifyContent], FLEX_WRAP_MAP[flexWrap]);
+    const className = (0, utils_1.cn)('twa:flex', 'twa:box-border', FLEX_DIRECTION_MAP[flexDirection], ALIGN_ITEMS_MAP[alignItems], JUSTIFY_CONTENT_MAP[justifyContent], FLEX_WRAP_MAP[flexWrap]);
     const Cmp = (as || 'div');
     return ((0, jsx_runtime_1.jsx)(Cmp, { ref: ref, ...domProps, className: (0, twMerge_1.twMerge)(className, props.className) }));
 });

package/src/components/FormLayout/index.d.ts

@@ -13,7 +13,7 @@ type TypeFormLayout = {
     defaultComponent?: React.ComponentType<any>;
     columns?: (string | number | FormColumn)[];
     placeholder?: ReactNode;
-    sizes?: (string | number)[];
+    sizes?: readonly (string | number)[];
     style?: React.CSSProperties;
     gridRowGap?: string | number;
     gridColumnGap?: string | number;

package/src/components/FormLayout/index.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
-const merge_1 = tslib_1.__importDefault(require("../../Utilities/utils/merge"));
+const ObjectExtensions_1 = require("../../Utilities/Extensions/ObjectExtensions");
 const join_1 = tslib_1.__importDefault(require("../utils/join"));
 const Flex_1 = require("../Flex");
 const FormLayoutContext = (0, react_1.createContext)(null);
@@ -27,7 +27,7 @@ const FormLayout = (props) => {
             };
         }
         if (defaultColumns[c.name]) {
-            c = (0, merge_1.default)({}, defaultColumns[c.name], c);
+            c = (0, ObjectExtensions_1.merge)({}, defaultColumns[c.name], c);
         }
         c.component = c.component === undefined ? defaultComponent : c.component;
         return c;

package/src/components/HelpBlock/index.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HelpBlockClassName = exports.baseClassName = void 0;
-const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
+const utils_1 = require("../../lib/utils");
 const Flex_1 = require("../Flex");
-const clsx_1 = tslib_1.__importDefault(require("clsx"));
 exports.baseClassName = 'ab-HelpBlock';
-exports.HelpBlockClassName = (0, clsx_1.default)('twa:text-2/relaxed twa:p-2 twa:rounded-standard', 'twa:bg-primarylight twa:text-primary-foreground', exports.baseClassName);
+exports.HelpBlockClassName = (0, utils_1.cn)('twa:text-2/relaxed twa:p-2 twa:rounded-standard', 'twa:bg-primarylight twa:text-primary-foreground', exports.baseClassName);
 const HelpBlock = (props) => {
-    return (0, jsx_runtime_1.jsx)(Flex_1.Box, { ...props, className: (0, clsx_1.default)(exports.HelpBlockClassName, props.className) });
+    return (0, jsx_runtime_1.jsx)(Flex_1.Box, { ...props, className: (0, utils_1.cn)(exports.HelpBlockClassName, props.className) });
 };
 exports.default = HelpBlock;

package/src/components/IconSelector/IconSelector.d.ts

@@ -1,5 +1,13 @@
 import { FunctionComponent } from 'react';
 import { CustomIcon } from '../../types';
+export interface IconSelectorPanelProps {
+    customIcons?: CustomIcon[];
+    value?: string;
+    onChange: (iconName: string) => void;
+    className?: string;
+    showTitle?: boolean;
+}
+export declare const IconSelectorPanel: FunctionComponent<IconSelectorPanelProps>;
 export interface IconSelectorProps {
     customIcons?: CustomIcon[];
     value?: string;

package/src/components/IconSelector/IconSelector.js

@@ -1,19 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IconSelector = void 0;
+exports.IconSelector = exports.IconSelectorPanel = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = tslib_1.__importDefault(require("react"));
+const utils_1 = require("../../lib/utils");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../../View/Components/AdaptableInput"));
 const Icon_1 = require("../Icon");
 const icons_1 = require("../icons");
 const OverlayTrigger_1 = tslib_1.__importDefault(require("../OverlayTrigger"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../SimpleButton"));
 const Flex_1 = require("../Flex");
+const wizardSelection_1 = require("../../Utilities/wizardSelection");
+const ICON_GRID_BUTTON_CLASS = 'twa:!min-w-[36px] twa:!w-9 twa:!h-9 twa:!p-0 twa:justify-center twa:items-center';
 const IconButton = (props) => {
-    return ((0, jsx_runtime_1.jsx)(SimpleButton_1.default, { onClick: () => props.onClick(), className: "twa:p-2", variant: props.active ? 'raised' : 'text', tone: props.active ? 'accent' : 'none', icon: props.icon, children: props.children }));
+    return ((0, jsx_runtime_1.jsx)(SimpleButton_1.default, { onClick: () => props.onClick(), className: (0, wizardSelection_1.wizardSelectionButtonClassName)(props.active, ICON_GRID_BUTTON_CLASS), variant: props.active ? 'outlined' : 'text', tone: "none", icon: props.icon, children: props.children }));
 };
-const IconSelector = (props) => {
+const IconSelectorPanel = (props) => {
     const [query, setQuery] = react_1.default.useState('');
     const allIconsNames = Object.keys(icons_1.allIcons);
     const filteredIcons = query
@@ -21,13 +24,15 @@ const IconSelector = (props) => {
             return iconName.toLowerCase().includes(query.toLowerCase());
         })
         : allIconsNames;
-    const iconsElements = filteredIcons.map((iconName) => {
-        return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { children: (0, jsx_runtime_1.jsx)(IconButton, { onClick: () => props.onChange(iconName), active: iconName === props.value, icon: iconName }) }, iconName));
-    });
+    const iconsElements = filteredIcons.map((iconName) => ((0, jsx_runtime_1.jsx)(IconButton, { onClick: () => props.onChange(iconName), active: iconName === props.value, icon: iconName }, iconName)));
     const customIconsElements = props.customIcons?.map((def) => {
-        return ((0, jsx_runtime_1.jsx)(IconButton, { active: false, onClick: () => props.onChange(def.name), children: (0, jsx_runtime_1.jsx)(Icon_1.IconComponent, { icon: def.icon }, def.name) }, def.name));
+        return ((0, jsx_runtime_1.jsx)(IconButton, { active: def.name === props.value, onClick: () => props.onChange(def.name), children: (0, jsx_runtime_1.jsx)(Icon_1.IconComponent, { icon: def.icon }, def.name) }, def.name));
     });
-    const popup = ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "ab-IconSelector__Popup", children: [(0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:mb-2", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:mb-2 twa:text-4", children: "Select an Icon" }), (0, jsx_runtime_1.jsx)(AdaptableInput_1.default, { value: query, onChange: (event) => setQuery(event.target.value ?? ''), className: "twa:w-full" })] }), (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { className: "twa:p-2 twa:w-[300px] twa:max-h-[300px] twa:overflow-auto twa:flex-wrap", children: [iconsElements, " ", customIconsElements] })] }));
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: (0, utils_1.cn)('ab-IconSelector__Popup', props.className), children: [(0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:mb-2", children: [props.showTitle ? ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:mb-2 twa:text-4", children: "Select an Icon" })) : null, (0, jsx_runtime_1.jsx)(AdaptableInput_1.default, { value: query, onChange: (event) => setQuery(event.target.value ?? ''), className: "twa:w-full", placeholder: "Search Icons" })] }), (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "row", flexWrap: "wrap", className: "twa:p-2 twa:w-[300px] twa:max-w-full twa:max-h-[300px] twa:overflow-auto twa:gap-0.5", children: [iconsElements, customIconsElements] })] }));
+};
+exports.IconSelectorPanel = IconSelectorPanel;
+const IconSelector = (props) => {
+    const popup = ((0, jsx_runtime_1.jsx)(exports.IconSelectorPanel, { customIcons: props.customIcons, value: props.value, onChange: props.onChange, showTitle: true }));
     let value = 'No Icon Selected';
     if (props.value in icons_1.allIcons) {
         value = ((0, jsx_runtime_1.jsx)(icons_1.Icon, { style: { display: 'inline-block' }, name: props.value }));

package/src/components/IconSelector/index.d.ts

@@ -1 +1,2 @@
 export * from './IconSelector';
+export { IconSelectorPanel } from './IconSelector';

package/src/components/IconSelector/index.js

@@ -1,4 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.IconSelectorPanel = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./IconSelector"), exports);
+var IconSelector_1 = require("./IconSelector");
+Object.defineProperty(exports, "IconSelectorPanel", { enumerable: true, get: function () { return IconSelector_1.IconSelectorPanel; } });

package/src/components/Input/NumberInput.js

@@ -30,7 +30,7 @@ exports.NumberInput = React.forwardRef((props, ref) => {
             // only set when a valid numer
             props.onChange(newVal);
         }
-    }, []);
+    }, [props.onChange]);
     React.useEffect(() => {
         setValue(props.value);
     }, [props.value]);

package/src/components/Input/index.js

@@ -18,7 +18,7 @@ const Input = React.forwardRef((props, ref) => {
         type = 'text';
     }
     return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { as: as ?? 'input', ref: ref, ...inputProps, type: type, disabled: disabled, className: (0, utils_1.cn)(exports.baseClassName, 'twa:min-h-input', 'twa:rounded-input', twUtils_1.targetOwn.focusOutline, type ? `${exports.baseClassName}--type-${type}` : '', disabled ? `${exports.baseClassName}--disabled` : '', {
-            'twa:bg-(--ab-cmp-input__background)': !disabled,
+            'twa:bg-input-background': !disabled,
             'twa:bg-(--ab-cmp-input--disabled__background)': disabled,
         }, className) }));
 });

package/src/components/Modal/index.js

@@ -6,12 +6,12 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_dom_1 = require("react-dom");
 const react_1 = require("react");
 const react_remove_scroll_1 = require("react-remove-scroll");
+const utils_1 = require("../../lib/utils");
 const Backdrop_1 = tslib_1.__importStar(require("./Backdrop"));
 const uuid_1 = require("../utils/uuid");
 const UIHelper_1 = require("../../View/UIHelper");
 const useStacking_1 = require("../WindowModal/useStacking");
 const Flex_1 = require("../Flex");
-const clsx_1 = tslib_1.__importDefault(require("clsx"));
 let portalElement;
 let loadingScreenPortalElement;
 const ensurePortalElement = () => {
@@ -48,6 +48,6 @@ const Modal = (props) => {
     const backdropZIndexOffset = 1;
     const stacking = (0, useStacking_1.useStacking)();
     const zIndex = stacking.zIndex;
-    return (0, react_dom_1.createPortal)(isOpen ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Backdrop_1.default, { timestamp: openTimestamp, uuid: uuid, zIndex: zIndex - backdropZIndexOffset, onBringToFront: onBringToFront }), (0, jsx_runtime_1.jsx)(react_remove_scroll_1.RemoveScroll, { children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", justifyContent: "center", flexDirection: "column", ...boxProps, style: { zIndex, ...style }, className: (0, clsx_1.default)('twa:fixed twa:inset-0 twa:z-1000 twa:font-(family-name:--ab__font-family)', Backdrop_1.baseClassName, className), children: children }) })] })) : null, portalElement);
+    return (0, react_dom_1.createPortal)(isOpen ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Backdrop_1.default, { timestamp: openTimestamp, uuid: uuid, zIndex: zIndex - backdropZIndexOffset, onBringToFront: onBringToFront }), (0, jsx_runtime_1.jsx)(react_remove_scroll_1.RemoveScroll, { children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", justifyContent: "center", flexDirection: "column", ...boxProps, style: { zIndex, ...style }, className: (0, utils_1.cn)('twa:fixed twa:inset-0 twa:z-1000 twa:font-(family-name:--ab__font-family)', Backdrop_1.baseClassName, className), children: children }) })] })) : null, portalElement);
 };
 exports.Modal = Modal;

package/src/components/NewSelect/index.d.ts

@@ -9,10 +9,12 @@ type SelectGroupType<T extends SelectItemType> = {
     items: T[];
 };
 type NewSelectBaseProps<T extends SelectItemType> = {
+    chevronIcon?: React.ReactNode;
     'data-name'?: string;
     open?: boolean;
     onOpenChange?: (open: boolean) => void;
     showClear?: boolean;
+    extraWidthChars?: number;
     multiple?: boolean;
     disabled?: boolean;
     value?: T['value'] | T['value'][];

package/src/components/NewSelect/index.js

@@ -34,9 +34,13 @@ const NewSelect = (props) => {
         ];
         allItems = props.items;
     }
-    const maxLabelLength = allItems.reduce((max, item) => Math.max(max, typeof item.label === 'string' ? item.label.length : 0), 0);
+    const maxLabelLength = allItems.reduce((max, item) => Math.max(max, typeof item.label === 'string'
+        ? item.label.length
+        : typeof item.tooltip === 'string'
+            ? item.tooltip.length
+            : 0), 0);
     const contentStyle = {
-        width: `max(${maxLabelLength + 3}ch, calc(var(--ab-base-space) * 20), var(--anchor-width))`,
+        width: `max(${maxLabelLength + (props.extraWidthChars ?? 3)}ch, calc(var(--ab-base-space) * 20), var(--anchor-width))`,
     };
     const renderValueProp = props.renderValue;
     const renderValueChild = renderValueProp
@@ -52,13 +56,22 @@ const NewSelect = (props) => {
             return item !== undefined ? renderValueProp(item) : undefined;
         }
         : undefined;
-    return ((0, jsx_runtime_1.jsxs)(select_1.Select, { multiple: props.multiple, open: props.open, onOpenChange: props.onOpenChange, isItemEqualToValue: isItemEqualToValue, items: allItems, disabled: props.disabled, value: props.value, onValueChange: props.onValueChange, "aria-label": props.ariaLabel, defaultValue: props.defaultValue, children: [(0, jsx_runtime_1.jsx)(select_1.SelectTrigger, { size: props.size === 'small' ? 'sm' : 'default', className: (0, utils_1.cn)('twa:max-w-80 ab-Select', props.className), "aria-invalid": isInvalid, "aria-label": props.ariaLabel, "data-name": props['data-name'], children: (0, jsx_runtime_1.jsx)(select_1.SelectValue, { placeholder: props.placeholder, className: 'twa:truncate twa:block!', children: renderValueChild }) }), (0, jsx_runtime_1.jsx)(select_1.SelectContent, { alignItemWithTrigger: false, container: props.container, stopMouseDownPropagation: props.stopMouseDownPropagation, style: contentStyle, children: groups.map((group, index) => {
+    return ((0, jsx_runtime_1.jsxs)(select_1.Select, { multiple: props.multiple, open: props.open, onOpenChange: props.onOpenChange, isItemEqualToValue: isItemEqualToValue, items: allItems, disabled: props.disabled, value: props.value, onValueChange: props.onValueChange, "aria-label": props.ariaLabel, defaultValue: props.defaultValue, children: [(0, jsx_runtime_1.jsx)(select_1.SelectTrigger, { size: props.size === 'small' ? 'sm' : 'default', className: (0, utils_1.cn)('twa:max-w-80 ab-Select', props.className), "aria-invalid": isInvalid, "aria-label": props.ariaLabel, "data-name": props['data-name'], icon: props.chevronIcon, onMouseDown: props.stopMouseDownPropagation
+                    ? (e) => {
+                        e.stopPropagation();
+                        e.nativeEvent?.stopPropagation?.();
+                    }
+                    : undefined, onClick: props.stopMouseDownPropagation
+                    ? (e) => {
+                        e.stopPropagation();
+                        e.nativeEvent?.stopPropagation?.();
+                    }
+                    : undefined, children: (0, jsx_runtime_1.jsx)(select_1.SelectValue, { placeholder: props.placeholder, className: 'twa:truncate twa:block!', children: renderValueChild }) }), (0, jsx_runtime_1.jsx)(select_1.SelectContent, { "aria-label": props.ariaLabel ? `${props.ariaLabel} content` : undefined, alignItemWithTrigger: false, container: props.container, stopMouseDownPropagation: props.stopMouseDownPropagation, style: contentStyle, children: groups.map((group, index) => {
                     return ((0, jsx_runtime_1.jsxs)(react_1.default.Fragment, { children: [(0, jsx_runtime_1.jsxs)(select_1.SelectGroup, { children: [group.label && (0, jsx_runtime_1.jsx)(select_1.SelectLabel, { children: group.label }), group.items.map((item) => {
-                                        const tooltipText = props.showItemTooltip
-                                            ? getItemTitle(item.label, item.value)
-                                            : undefined;
+                                        const itemTitle = getItemTitle(item.label, item.value);
+                                        const tooltipText = props.showItemTooltip ? itemTitle : undefined;
                                         const itemContent = item.label;
-                                        const itemElement = ((0, jsx_runtime_1.jsx)(select_1.SelectItem, { value: item.value, className: 'ab-Select-Row', disabled: item.disabled, children: itemContent }, item.value));
+                                        const itemElement = ((0, jsx_runtime_1.jsx)(select_1.SelectItem, { value: item.value, "aria-label": itemTitle || undefined, className: 'ab-Select-Row', disabled: item.disabled, children: itemContent }, item.value));
                                         if (tooltipText != null) {
                                             return ((0, jsx_runtime_1.jsxs)(tooltip_1.Tooltip, { children: [(0, jsx_runtime_1.jsx)(tooltip_1.TooltipTrigger, { render: itemElement, children: itemContent }), (0, jsx_runtime_1.jsx)(tooltip_1.TooltipContent, { side: "right", children: tooltipText })] }, item.value));
                                         }

package/src/components/OverlayTrigger/index.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
-const debounce_1 = tslib_1.__importDefault(require("../../Utilities/utils/debounce"));
+const TimingHelper_1 = require("../../Utilities/Helpers/TimingHelper");
 const batchUpdate_1 = tslib_1.__importDefault(require("../utils/batchUpdate"));
 const selectParent_1 = tslib_1.__importDefault(require("../utils/selectParent"));
 const useProperty_1 = tslib_1.__importDefault(require("../utils/useProperty"));
@@ -100,7 +100,7 @@ const OverlayTrigger = React.forwardRef((givenProps, ref) => {
     // visible state may quickly change from true -> false -> true
     // when moving the mouse cursor from the trigger to the overlay
     // for this case we debounce the visible change for a very small amount of time
-    (0, debounce_1.default)((visible) => {
+    (0, TimingHelper_1.debounce)((visible) => {
         // if (!visible) {
         //   return;
         // }

package/src/components/Panel/index.js

@@ -4,11 +4,11 @@ exports.baseClassName = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
-const clsx_1 = tslib_1.__importDefault(require("clsx"));
+const utils_1 = require("../../lib/utils");
 const Flex_1 = require("../Flex");
 const twMerge_1 = require("../../twMerge");
 exports.baseClassName = 'ab-Panel';
-const DEFAULT_BODY_CLS = 'twa:relative twa:flex-1 twa:p-2 twa:bg-defaultbackground twa:text-foreground';
+const DEFAULT_BODY_CLS = 'twa:relative twa:flex-1 twa:p-2 twa:bg-background twa:text-foreground';
 const Header = ({ children, variant = 'default', className, style, onClick, ...flexProps }) => {
     if (!children) {
         return null;
@@ -22,16 +22,16 @@ const Body = ({ children, bodyScroll, variant, className, style, }) => {
     if (bodyScroll === true) {
         bodyScroll = 'auto';
     }
-    const bodyCls = (0, clsx_1.default)(DEFAULT_BODY_CLS, `${exports.baseClassName}__body`, variant && `${exports.baseClassName}__body--variant-${variant}`, bodyScroll ? `twa:overflow-auto` : null, {
-        'twa:bg-primarylight twa:text-text-on-primary twa:border-0': variant === 'modern',
+    const bodyCls = (0, utils_1.cn)(DEFAULT_BODY_CLS, `${exports.baseClassName}__body`, variant && `${exports.baseClassName}__body--variant-${variant}`, bodyScroll ? `twa:overflow-auto` : null, {
+        'twa:bg-primarylight twa:text-primary-foreground twa:border-0': variant === 'modern',
     }, className);
     return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { style: style, className: bodyCls, children: children }));
 };
 const PlainHeader = ({ children, className }) => {
-    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: (0, clsx_1.default)(`${exports.baseClassName}__header`, `${exports.baseClassName}__header--variant-plain`, className), children: children }));
+    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: (0, utils_1.cn)(`${exports.baseClassName}__header`, `${exports.baseClassName}__header--variant-plain`, className), children: children }));
 };
 const FlexBody = ({ children, className }) => {
-    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: (0, clsx_1.default)(DEFAULT_BODY_CLS, `${exports.baseClassName}__body`, `${exports.baseClassName}__body--variant-flex`, 'twa:overflow-auto twa:min-h-0', 'twa:flex-1 twa:flex twa:flex-col', className), children: children }));
+    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: (0, utils_1.cn)(DEFAULT_BODY_CLS, `${exports.baseClassName}__body`, `${exports.baseClassName}__body--variant-flex`, 'twa:overflow-auto twa:min-h-0', 'twa:flex-1 twa:flex twa:flex-col', className), children: children }));
 };
 const Panel = (props) => {
     const { border, className, header, children, headerProps, bodyProps, bodyScroll, variant = 'default', ...boxProps } = props;
@@ -44,7 +44,7 @@ const Panel = (props) => {
         border,
         ...(bodyProps ? bodyProps.style : null),
     };
-    const cls = (0, twMerge_1.twMerge)((0, clsx_1.default)(exports.baseClassName, `${exports.baseClassName}--variant-${variant}`, !header ? `${exports.baseClassName}--no-header` : `${exports.baseClassName}--with-header`, 'twa:rounded-standard', 'twa:flex twa:flex-col'), className);
+    const cls = (0, utils_1.cn)(exports.baseClassName, `${exports.baseClassName}--variant-${variant}`, !header ? `${exports.baseClassName}--no-header` : `${exports.baseClassName}--with-header`, 'twa:rounded-standard', 'twa:flex twa:flex-col', className);
     let headerCls = headerProps?.className;
     if (cls.includes('twa:rounded-none')) {
         headerCls = (0, twMerge_1.twMerge)(headerCls, 'twa:rounded-none');
@@ -69,10 +69,10 @@ const Panel = (props) => {
     });
     if (theHeader) {
         childrenArr = childrenArr.filter((child) => child !== theHeader);
-        theHeader = ((0, jsx_runtime_1.jsx)(PlainHeader, { ...theHeader.props, className: (0, clsx_1.default)(headerCls, theHeader.props.className ?? '') }));
+        theHeader = ((0, jsx_runtime_1.jsx)(PlainHeader, { ...theHeader.props, className: (0, utils_1.cn)(headerCls, theHeader.props.className ?? '') }));
     }
     if (theBody) {
-        theBody = ((0, jsx_runtime_1.jsx)(FlexBody, { ...theBody.props, className: (0, clsx_1.default)(bodyCls, theBody.props.className ?? '') }));
+        theBody = ((0, jsx_runtime_1.jsx)(FlexBody, { ...theBody.props, className: (0, utils_1.cn)(bodyCls, theBody.props.className ?? '') }));
     }
     return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { ...boxProps, style: { ...style, ...boxProps.style }, className: cls, children: [theHeader ?? ((0, jsx_runtime_1.jsx)(Header, { ...headerProps, style: headerStyle, variant: variant, className: headerCls, children: header })), theBody ??
                 (childrenArr.length > 0 ? ((0, jsx_runtime_1.jsx)(Body, { ...bodyProps, style: bodyStyle, bodyScroll: bodyScroll, variant: variant, className: (0, twMerge_1.twMerge)(bodyCls), children: childrenArr })) : null)] }));

package/src/components/Radio/index.d.ts

@@ -9,7 +9,7 @@ type TypeProps = {
     value?: any;
     onChange?: (checked: boolean, event?: SyntheticEvent | any) => void;
     children?: ReactNode | React.JSX.Element;
-    gapDistance?: number;
+    gapDistance?: number | string;
     childrenPosition?: 'start' | 'end';
     variant?: Variant;
 };

package/src/components/Radio/index.js

@@ -8,8 +8,8 @@ const react_1 = require("react");
 const useProperty_1 = tslib_1.__importDefault(require("../utils/useProperty"));
 const Flex_1 = require("../Flex");
 const twMerge_1 = require("../../twMerge");
-const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const twUtils_1 = require("../twUtils");
+const utils_1 = require("../../lib/utils");
 const RadioContext = React.createContext({
     value: null,
     name: '',
@@ -20,7 +20,7 @@ const useRadioContext = () => {
     return React.useContext(RadioContext);
 };
 exports.useRadioContext = useRadioContext;
-const Radio = ({ children, checked, onChange, value, name, gapDistance = 10, childrenPosition = 'end', as = 'label', id, tabIndex, disabled, ...props }) => {
+const Radio = ({ children, checked, onChange, value, name, gapDistance = 'var(--ab-radio-gap)', childrenPosition = 'end', as = 'label', id, tabIndex, disabled, ...props }) => {
     const context = (0, exports.useRadioContext)();
     const { value: contextValue, onChange: contextOnChange, name: contextName, variant } = context;
     const [stateChecked, setStateChecked] = (0, react_1.useState)(false);
@@ -46,7 +46,7 @@ const Radio = ({ children, checked, onChange, value, name, gapDistance = 10, chi
     const beforeGap = childrenPosition === 'start' ? gap : null;
     const after = childrenPosition === 'end' ? children : null;
     const afterGap = childrenPosition === 'end' ? gap : null;
-    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { ...props, className: (0, twMerge_1.twMerge)(`ab-Radio twa:my-2 twa:inline-flex twa:flex-row twa:items-center twa:cursor-pointer twa:relative`, props.className), "data-checked": computedChecked, as: as, children: [before, beforeGap, (0, jsx_runtime_1.jsx)("input", { disabled: disabled, className: (0, clsx_1.default)('ab-Radio-input', twUtils_1.targetOwn.focusOutline, 'twa:align-middle', 'twa:m-0', 'twa:rounded-full', 'twa:cursor-pointer', 'twa:position-relative', 'twa:w-[1rem]', 'twa:h-[1rem]', 'twa:min-w-[1rem]', 'twa:min-h-[1rem]', variant === 'default' && 'ab-Radio-input--default', variant === 'text-only' && 'ab-Radio-input--text-only twa:size-0 twa:opacity-0'), id: id, checked: computedChecked, type: "radio", name: name ?? contextName, value: value, tabIndex: tabIndex, onChange: onInputChange }), afterGap, after] }));
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { ...props, className: (0, twMerge_1.twMerge)(`ab-Radio twa:my-2 twa:inline-flex twa:flex-row twa:items-center twa:cursor-pointer twa:relative`, props.className), "data-checked": computedChecked, as: as, children: [before, beforeGap, (0, jsx_runtime_1.jsx)("input", { disabled: disabled, className: (0, utils_1.cn)('ab-Radio-input', twUtils_1.targetOwn.focusOutline, 'twa:align-middle', 'twa:m-0', 'twa:rounded-full', 'twa:cursor-pointer', 'twa:position-relative', 'twa:w-[1rem]', 'twa:h-[1rem]', 'twa:min-w-[1rem]', 'twa:min-h-[1rem]', variant === 'default' && 'ab-Radio-input--default', variant === 'text-only' && 'ab-Radio-input--text-only twa:size-0 twa:opacity-0'), id: id, checked: computedChecked, type: "radio", name: name ?? contextName, value: value, tabIndex: tabIndex, onChange: onInputChange }), afterGap, after] }));
 };
 const RadioGroup = (props) => {
     const { orientation, value: _value, name, onRadioChange, children, variant = 'default' } = props;
@@ -55,13 +55,15 @@ const RadioGroup = (props) => {
             onRadioChange(value);
         },
     });
-    return ((0, jsx_runtime_1.jsx)(RadioContext.Provider, { value: { value, onChange: setValue, name, variant }, children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: (0, clsx_1.default)('ab-RadioGroup', props.className), flexDirection: orientation == 'horizontal' ? 'row' : 'column', alignItems: orientation == 'horizontal' ? 'center' : 'flex-start', children: children }) }));
+    return ((0, jsx_runtime_1.jsx)(RadioContext.Provider, { value: { value, onChange: setValue, name, variant }, children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: (0, utils_1.cn)('ab-RadioGroup', props.className), flexDirection: orientation == 'horizontal' ? 'row' : 'column', alignItems: orientation == 'horizontal' ? 'center' : 'flex-start', children: children }) }));
 };
 exports.RadioGroup = RadioGroup;
 exports.radioGroupStyling = {
-    horizontalTextOnly: (0, clsx_1.default)('twa:bg-primarylight twa:rounded-standard twa:p-1 twa:gap-5', {
-        'twa:*:flex-1 twa:*:rounded-standard twa:*:p-1 twa:*:m-0': 'default styles for all the radio buttons',
+    horizontalTextOnly: (0, utils_1.cn)('twa:bg-primarylight twa:rounded-standard twa:p-1 twa:gap-5', {
+        'twa:*:flex-1 twa:*:shrink-0 twa:*:min-w-fit twa:*:rounded-standard twa:*:p-1 twa:*:m-0 twa:*:px-4': 'default styles for all the radio buttons',
         'twa:*:data-[checked=true]:bg-accent twa:*:data-[checked=true]:text-accent-foreground': 'style the checked state',
+        'twa:[--ab-radio-gap:0]': 'remove the gap between the radio input and its label',
+        'twa:[&_input]:size-0 twa:[&_input]:min-w-0 twa:[&_input]:min-h-0 twa:[&_input]:border-0 twa:[&_input]:p-0': 'collapse any nested radio inputs to zero size (overriding their fixed min-w/min-h)',
         [twUtils_1.targetChildren.focusWithinOutline]: 'styles for when a radio is currently focused - show a ring, so people know they can do keyboard nav with left/right arrow keys',
     }),
 };