@a-type/ui 3.0.3 → 3.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/components/button/Button.d.ts +2 -1
- package/dist/cjs/components/button/Button.js +5 -2
- package/dist/cjs/components/button/Button.js.map +1 -1
- package/dist/esm/components/button/Button.d.ts +2 -1
- package/dist/esm/components/button/Button.js +5 -2
- package/dist/esm/components/button/Button.js.map +1 -1
- package/package.json +1 -1
- package/src/components/button/Button.tsx +7 -1
|
@@ -13,8 +13,9 @@ export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
|
|
|
13
13
|
visuallyFocused?: boolean;
|
|
14
14
|
disableIconMode?: boolean;
|
|
15
15
|
ref?: Ref<HTMLButtonElement>;
|
|
16
|
+
disableDropdownTriggerIcon?: boolean;
|
|
16
17
|
}
|
|
17
|
-
export declare function ButtonRoot({ className, color, emphasis, size, toggled, toggleMode, align, visuallyDisabled, visuallyFocused, loading, children, disabled, asChild, disableIconMode, ref, ...props }: ButtonProps): import("react/jsx-runtime.js").JSX.Element;
|
|
18
|
+
export declare function ButtonRoot({ className, color, emphasis, size, toggled, toggleMode, align, visuallyDisabled, visuallyFocused, loading, children, disabled, asChild, disableIconMode, disableDropdownTriggerIcon, ref, ...props }: ButtonProps): import("react/jsx-runtime.js").JSX.Element;
|
|
18
19
|
export declare const ButtonToggleIndicator: import("react").NamedExoticComponent<{
|
|
19
20
|
value: boolean;
|
|
20
21
|
}>;
|
|
@@ -31,7 +31,7 @@ const index_js_1 = require("../icon/index.js");
|
|
|
31
31
|
const index_js_2 = require("../spinner/index.js");
|
|
32
32
|
const classes_js_1 = require("./classes.js");
|
|
33
33
|
function ButtonRoot(_a) {
|
|
34
|
-
var { className, color, emphasis = 'default', size, toggled, toggleMode = 'color-and-indicator', align, visuallyDisabled, visuallyFocused, loading, children, disabled, asChild, disableIconMode, ref } = _a, props = __rest(_a, ["className", "color", "emphasis", "size", "toggled", "toggleMode", "align", "visuallyDisabled", "visuallyFocused", "loading", "children", "disabled", "asChild", "disableIconMode", "ref"]);
|
|
34
|
+
var { className, color, emphasis = 'default', size, toggled, toggleMode = 'color-and-indicator', align, visuallyDisabled, visuallyFocused, loading, children, disabled, asChild, disableIconMode, disableDropdownTriggerIcon, ref } = _a, props = __rest(_a, ["className", "color", "emphasis", "size", "toggled", "toggleMode", "align", "visuallyDisabled", "visuallyFocused", "loading", "children", "disabled", "asChild", "disableIconMode", "disableDropdownTriggerIcon", "ref"]);
|
|
35
35
|
const Comp = asChild ? react_slot_1.Slot : 'button';
|
|
36
36
|
const isFormSubmitting = false;
|
|
37
37
|
const isSubmitLoading = props.type === 'submit' && isFormSubmitting;
|
|
@@ -39,7 +39,10 @@ function ButtonRoot(_a) {
|
|
|
39
39
|
const childArray = react_2.Children.toArray(children);
|
|
40
40
|
const iconChildCount = childArray.filter(isIconChild).length;
|
|
41
41
|
const hasLabelChild = childArray.length > iconChildCount;
|
|
42
|
-
const
|
|
42
|
+
const isDropdownTriggerFromContext = (0, DropdownTriggerContext_js_1.useIsDropdownTrigger)();
|
|
43
|
+
const isDropdownTrigger = !disableDropdownTriggerIcon &&
|
|
44
|
+
hasLabelChild &&
|
|
45
|
+
isDropdownTriggerFromContext;
|
|
43
46
|
const finalRef = (0, useMergedRef_js_1.default)(useAnnotateWithChildParts(), ref);
|
|
44
47
|
const buttonProps = Object.assign(Object.assign({ ref: finalRef }, props), { disabled: disabled || isLoading, 'data-disabled': visuallyDisabled, 'data-focus': visuallyFocused, 'data-size': size, 'data-loading': isLoading, 'data-has-label': hasLabelChild || undefined, 'data-icon-count': iconChildCount > 0 ? iconChildCount : undefined, 'data-dropdown-trigger': isDropdownTrigger ? true : undefined, tabIndex: visuallyDisabled ? -1 : undefined, className: (0, clsx_1.clsx)((0, classes_js_1.getButtonClassName)({
|
|
45
48
|
color,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../src/components/button/Button.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../src/components/button/Button.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,9 @@ export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
|
|
|
13
13
|
visuallyFocused?: boolean;
|
|
14
14
|
disableIconMode?: boolean;
|
|
15
15
|
ref?: Ref<HTMLButtonElement>;
|
|
16
|
+
disableDropdownTriggerIcon?: boolean;
|
|
16
17
|
}
|
|
17
|
-
export declare function ButtonRoot({ className, color, emphasis, size, toggled, toggleMode, align, visuallyDisabled, visuallyFocused, loading, children, disabled, asChild, disableIconMode, ref, ...props }: ButtonProps): import("react/jsx-runtime").JSX.Element;
|
|
18
|
+
export declare function ButtonRoot({ className, color, emphasis, size, toggled, toggleMode, align, visuallyDisabled, visuallyFocused, loading, children, disabled, asChild, disableIconMode, disableDropdownTriggerIcon, ref, ...props }: ButtonProps): import("react/jsx-runtime").JSX.Element;
|
|
18
19
|
export declare const ButtonToggleIndicator: import("react").NamedExoticComponent<{
|
|
19
20
|
value: boolean;
|
|
20
21
|
}>;
|
|
@@ -24,7 +24,7 @@ import { Icon } from '../icon/index.js';
|
|
|
24
24
|
import { Spinner } from '../spinner/index.js';
|
|
25
25
|
import { getButtonClassName } from './classes.js';
|
|
26
26
|
export function ButtonRoot(_a) {
|
|
27
|
-
var { className, color, emphasis = 'default', size, toggled, toggleMode = 'color-and-indicator', align, visuallyDisabled, visuallyFocused, loading, children, disabled, asChild, disableIconMode, ref } = _a, props = __rest(_a, ["className", "color", "emphasis", "size", "toggled", "toggleMode", "align", "visuallyDisabled", "visuallyFocused", "loading", "children", "disabled", "asChild", "disableIconMode", "ref"]);
|
|
27
|
+
var { className, color, emphasis = 'default', size, toggled, toggleMode = 'color-and-indicator', align, visuallyDisabled, visuallyFocused, loading, children, disabled, asChild, disableIconMode, disableDropdownTriggerIcon, ref } = _a, props = __rest(_a, ["className", "color", "emphasis", "size", "toggled", "toggleMode", "align", "visuallyDisabled", "visuallyFocused", "loading", "children", "disabled", "asChild", "disableIconMode", "disableDropdownTriggerIcon", "ref"]);
|
|
28
28
|
const Comp = asChild ? Slot : 'button';
|
|
29
29
|
const isFormSubmitting = false;
|
|
30
30
|
const isSubmitLoading = props.type === 'submit' && isFormSubmitting;
|
|
@@ -32,7 +32,10 @@ export function ButtonRoot(_a) {
|
|
|
32
32
|
const childArray = Children.toArray(children);
|
|
33
33
|
const iconChildCount = childArray.filter(isIconChild).length;
|
|
34
34
|
const hasLabelChild = childArray.length > iconChildCount;
|
|
35
|
-
const
|
|
35
|
+
const isDropdownTriggerFromContext = useIsDropdownTrigger();
|
|
36
|
+
const isDropdownTrigger = !disableDropdownTriggerIcon &&
|
|
37
|
+
hasLabelChild &&
|
|
38
|
+
isDropdownTriggerFromContext;
|
|
36
39
|
const finalRef = useMergedRef(useAnnotateWithChildParts(), ref);
|
|
37
40
|
const buttonProps = Object.assign(Object.assign({ ref: finalRef }, props), { disabled: disabled || isLoading, 'data-disabled': visuallyDisabled, 'data-focus': visuallyFocused, 'data-size': size, 'data-loading': isLoading, 'data-has-label': hasLabelChild || undefined, 'data-icon-count': iconChildCount > 0 ? iconChildCount : undefined, 'data-dropdown-trigger': isDropdownTrigger ? true : undefined, tabIndex: visuallyDisabled ? -1 : undefined, className: clsx(getButtonClassName({
|
|
38
41
|
color,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../src/components/button/Button.tsx"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAEN,QAAQ,EACR,IAAI,EAGJ,WAAW,EACX,QAAQ,GACR,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,YAAY,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../src/components/button/Button.tsx"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAEN,QAAQ,EACR,IAAI,EAGJ,WAAW,EACX,QAAQ,GACR,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,YAAY,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAwBlD,MAAM,UAAU,UAAU,CAAC,EAkBb;QAlBa,EAC1B,SAAS,EACT,KAAK,EACL,QAAQ,GAAG,SAAS,EACpB,IAAI,EACJ,OAAO,EACP,UAAU,GAAG,qBAAqB,EAClC,KAAK,EACL,gBAAgB,EAChB,eAAe,EACf,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,eAAe,EACf,0BAA0B,EAC1B,GAAG,OAEU,EADV,KAAK,cAjBkB,yNAkB1B,CADQ;IAER,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC;IAEvC,MAAM,gBAAgB,GAAG,KAAK,CAAC;IAC/B,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,gBAAgB,CAAC;IACpE,MAAM,SAAS,GAAG,OAAO,IAAI,eAAe,CAAC;IAE7C,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;IAC7D,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,GAAG,cAAc,CAAC;IAEzD,MAAM,4BAA4B,GAAG,oBAAoB,EAAE,CAAC;IAC5D,MAAM,iBAAiB,GACtB,CAAC,0BAA0B;QAC3B,aAAa;QACb,4BAA4B,CAAC;IAE9B,MAAM,QAAQ,GAAG,YAAY,CAAC,yBAAyB,EAAE,EAAE,GAAG,CAAC,CAAC;IAEhE,MAAM,WAAW,iCAChB,GAAG,EAAE,QAAQ,IACV,KAAK,KACR,QAAQ,EAAE,QAAQ,IAAI,SAAS,EAC/B,eAAe,EAAE,gBAAgB,EACjC,YAAY,EAAE,eAAe,EAC7B,WAAW,EAAE,IAAI,EACjB,cAAc,EAAE,SAAS,EACzB,gBAAgB,EAAE,aAAa,IAAI,SAAS,EAC5C,iBAAiB,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,EAClE,uBAAuB,EAAE,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAC7D,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAC3C,SAAS,EAAE,IAAI,CACd,kBAAkB,CAAC;YAClB,KAAK;YACL,QAAQ;YACR,IAAI;YACJ,UAAU,EACT,OAAO,KAAK,SAAS;gBACrB,CAAC,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,qBAAqB,CAAC;YACjE,KAAK;YACL,eAAe;SACf,CAAC,EACF,SAAS,CACT,GACD,CAAC;IACF,4BAA4B;IAC5B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;IACzC,CAAC;IAED,qDAAqD;IACrD,IAAI,OAAO,EAAE,CAAC;QACb,+CAA+C;QAC/C,OAAO,KAAC,IAAI,oBAAK,WAAW,cAAG,QAAQ,IAAQ,CAAC;IACjD,CAAC;IAED,OAAO,CACN,KAAC,mBAAmB,IAAC,KAAK,EAAE,SAAS,YACpC,MAAC,IAAI,oBAAK,WAAW,eACpB,KAAC,eAAe,cACd,SAAS,IAAI,CACb,KAAC,MAAM,CAAC,GAAG,IAEV,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,EAC5C,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,EAAE,EACzC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,EACzC,SAAS,EAAE,IAAI,CACd,yDAAyD,EACzD,iCAAiC,CACjC,yCAGD,KAAC,OAAO,IAAC,IAAI,EAAE,EAAE,EAAE,SAAS,EAAC,0BAA0B,GAAG,IAVtD,SAAS,CAWD,CACb,GACgB,EACjB,OAAO,KAAK,SAAS;oBACrB,CAAC,UAAU,KAAK,WAAW;wBAC1B,UAAU,KAAK,qBAAqB,CAAC,IAAI,CACzC,KAAC,qBAAqB,IAAC,KAAK,EAAE,OAAO,GAAI,CACzC,EACD,QAAQ,EACR,iBAAiB,IAAI,CACrB,KAAC,uBAAuB,IAAC,OAAO,kBAC/B,KAAC,IAAI,IAAC,IAAI,EAAC,SAAS,GAAG,GACE,CAC1B,KACK,GACc,CACtB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC,SAAS,eAAe,CAAC,EAClE,KAAK,GAGL;IACA,OAAO,CACN,KAAC,IAAI,yBAEJ,IAAI,EAAC,OAAO,EACZ,SAAS,EAAC,4BAA4B,EACtC,KAAK,EAAE;YACN,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SACzB,GACA,CACF,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,sDAAsD;AACtD,MAAM,CAAC,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;AAE1E,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE;IAC/C,eAAe,EAAE,qBAAqB;IACtC,IAAI,EAAE,UAAU;CAChB,CAAC,CAAC;AAEH,SAAS,yBAAyB;IACjC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,GAAG,EAAE;QACtC,IAAI,OAAO,MAAM,KAAK,WAAW;YAAE,OAAO,IAAK,CAAC;QAChD,OAAO,IAAI,gBAAgB,CAAC,CAAC,OAAO,EAAE,EAAE;YACvC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAA2B,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEN,MAAM,GAAG,GAAG,WAAW,CACtB,CAAC,IAA8B,EAAE,EAAE;QAClC,IAAI,IAAI,IAAI,gBAAgB,EAAE,CAAC;YAC9B,gBAAgB,CAAC,UAAU,EAAE,CAAC;YAC9B,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACnE,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;aAAM,IAAI,gBAAgB,EAAE,CAAC;YAC7B,gBAAgB,CAAC,UAAU,EAAE,CAAC;QAC/B,CAAC;IACF,CAAC,EACD,CAAC,gBAAgB,CAAC,CAClB,CAAC;IAEF,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAyB;IACrD,uDAAuD;IACvD,MAAM,QAAQ,GAAG;QAChB,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,CAAC;KACR,CAAC;IACF,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACnC,IAAI,CAAC,CAAC,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,UAAU,CAAC;YAAE,OAAO;QAC3E,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,KAAK,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,GAAG;YAAE,OAAO,CAAC,uBAAuB;QAChG,IACC,CAAC,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,UAAU,CAAC;YAC7D,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAC/B,CAAC;YACF,QAAQ,CAAC,IAAI,EAAE,CAAC;QACjB,CAAC;aAAM,CAAC;YACP,QAAQ,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC;IACF,CAAC,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACxB,QAAQ,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC;IACD,MAAM,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;IAChE,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,YAAY,CAAC,iBAAiB,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,WAAW,CAAC,KAAgB;IACpC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC9D,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;QACrB,MAAM,IAAI,GAAI,KAAa,CAAC,IAAI,CAAC;QACjC,IAAI,IAAI,KAAK,UAAU;YAAE,OAAO,IAAI,CAAC;QACrC,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAC/B,IAAI,OAAO,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,WAAW,KAAK,MAAM;YAAE,OAAO,IAAI,CAAC;IAC5E,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC"}
|
package/package.json
CHANGED
|
@@ -39,6 +39,7 @@ export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
|
|
|
39
39
|
visuallyFocused?: boolean;
|
|
40
40
|
disableIconMode?: boolean;
|
|
41
41
|
ref?: Ref<HTMLButtonElement>;
|
|
42
|
+
disableDropdownTriggerIcon?: boolean;
|
|
42
43
|
}
|
|
43
44
|
|
|
44
45
|
export function ButtonRoot({
|
|
@@ -56,6 +57,7 @@ export function ButtonRoot({
|
|
|
56
57
|
disabled,
|
|
57
58
|
asChild,
|
|
58
59
|
disableIconMode,
|
|
60
|
+
disableDropdownTriggerIcon,
|
|
59
61
|
ref,
|
|
60
62
|
...props
|
|
61
63
|
}: ButtonProps) {
|
|
@@ -69,7 +71,11 @@ export function ButtonRoot({
|
|
|
69
71
|
const iconChildCount = childArray.filter(isIconChild).length;
|
|
70
72
|
const hasLabelChild = childArray.length > iconChildCount;
|
|
71
73
|
|
|
72
|
-
const
|
|
74
|
+
const isDropdownTriggerFromContext = useIsDropdownTrigger();
|
|
75
|
+
const isDropdownTrigger =
|
|
76
|
+
!disableDropdownTriggerIcon &&
|
|
77
|
+
hasLabelChild &&
|
|
78
|
+
isDropdownTriggerFromContext;
|
|
73
79
|
|
|
74
80
|
const finalRef = useMergedRef(useAnnotateWithChildParts(), ref);
|
|
75
81
|
|