@plasmicpkgs/react-aria 0.0.72 → 0.0.74

package/dist/react-aria.esm.js

@@ -2,13 +2,13 @@ import React, { useEffect, useState, useMemo, forwardRef, useImperativeHandle, C
 import { Button, Checkbox, Text, FieldError, Label, CheckboxGroup, Input, ListBoxItem, ListBox, Section, Header, PopoverContext, Popover, ComboBox, ComboBoxStateContext, Heading, ModalOverlay, Modal, Dialog, DialogTrigger, Radio, RadioGroup, Select, SelectStateContext, SelectValue, SliderOutput, SliderThumb, Slider, SliderTrack, Switch, TextArea, TextField, TooltipTrigger, Tooltip } from 'react-aria-components';
 import { usePlasmicCanvasContext, usePlasmicCanvasComponentInfo } from '@plasmicapp/host';
 import registerComponent from '@plasmicapp/host/registerComponent';
-import { mergeProps, useButton } from 'react-aria';
+import { mergeProps, useFocusable } from 'react-aria';
 import { mergeProps as mergeProps$1 } from '@react-aria/utils';
 import flattenChildren from 'react-keyed-flatten-children';
 
 var __defProp$r = Object.defineProperty;
-var __defProps$h = Object.defineProperties;
-var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
+var __defProps$g = Object.defineProperties;
+var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
 var __hasOwnProp$r = Object.prototype.hasOwnProperty;
 var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
@@ -24,7 +24,7 @@ var __spreadValues$r = (a, b) => {
     }
   return a;
 };
-var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
+var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
 function useAutoOpen({
   props,
   open,
@@ -46,13 +46,13 @@ function useAutoOpen({
 }
 function registerComponentHelper(loader, component, meta, overrides) {
   var _a;
-  meta = __spreadProps$h(__spreadValues$r({}, meta), {
+  meta = __spreadProps$g(__spreadValues$r({}, meta), {
     defaultStyles: __spreadValues$r({
       boxSizing: "border-box"
     }, (_a = meta.defaultStyles) != null ? _a : {})
   });
   if (overrides) {
-    meta = __spreadProps$h(__spreadValues$r(__spreadValues$r({}, meta), overrides), {
+    meta = __spreadProps$g(__spreadValues$r(__spreadValues$r({}, meta), overrides), {
       props: __spreadValues$r(__spreadValues$r({}, meta.props), overrides.props)
     });
     if (overrides.parentComponentName) {
@@ -517,8 +517,8 @@ function pickAriaComponentVariants(keys) {
 }
 
 var __defProp$q = Object.defineProperty;
-var __defProps$g = Object.defineProperties;
-var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
+var __defProps$f = Object.defineProperties;
+var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
 var __hasOwnProp$q = Object.prototype.hasOwnProperty;
 var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
@@ -534,8 +534,8 @@ var __spreadValues$q = (a, b) => {
     }
   return a;
 };
-var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
-var __objRest$n = (source, exclude) => {
+var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
+var __objRest$o = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$q.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -557,7 +557,7 @@ const BUTTON_VARIANTS = [
 const { variants: variants$f, withObservedValues: withObservedValues$d } = pickAriaComponentVariants(BUTTON_VARIANTS);
 const BaseButton = React.forwardRef(
   (props, ref) => {
-    const _a = props, { submitsForm, resetsForm, children, plasmicUpdateVariant } = _a, rest = __objRest$n(_a, ["submitsForm", "resetsForm", "children", "plasmicUpdateVariant"]);
+    const _a = props, { submitsForm, resetsForm, children, plasmicUpdateVariant } = _a, rest = __objRest$o(_a, ["submitsForm", "resetsForm", "children", "plasmicUpdateVariant"]);
     const type = submitsForm ? "submit" : resetsForm ? "reset" : "button";
     return /* @__PURE__ */ React.createElement(Button, __spreadValues$q({ type, ref }, rest), ({ isHovered, isPressed, isFocused, isFocusVisible, isDisabled }) => withObservedValues$d(
       children,
@@ -590,7 +590,7 @@ function registerButton(loader, overrides) {
         padding: "2px 10px",
         cursor: "pointer"
       },
-      props: __spreadProps$g(__spreadValues$q({}, getCommonProps("button", [
+      props: __spreadProps$f(__spreadValues$q({}, getCommonProps("button", [
         "autoFocus",
         "isDisabled",
         "aria-label"
@@ -622,6 +622,10 @@ function registerButton(loader, overrides) {
         onPress: {
           type: "eventHandler",
           argTypes: [{ name: "event", type: "object" }]
+        },
+        onFocus: {
+          type: "eventHandler",
+          argTypes: [{ name: "event", type: "object" }]
         }
       }),
       trapsFocus: true
@@ -642,8 +646,8 @@ React.createContext(void 0);
 const PlasmicInputContext = React.createContext(void 0);
 
 var __defProp$p = Object.defineProperty;
-var __defProps$f = Object.defineProperties;
-var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
+var __defProps$e = Object.defineProperties;
+var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$p = Object.getOwnPropertySymbols;
 var __hasOwnProp$p = Object.prototype.hasOwnProperty;
 var __propIsEnum$p = Object.prototype.propertyIsEnumerable;
@@ -659,8 +663,8 @@ var __spreadValues$p = (a, b) => {
     }
   return a;
 };
-var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
-var __objRest$m = (source, exclude) => {
+var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
+var __objRest$n = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$p.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -685,7 +689,7 @@ const CHECKBOX_VARIANTS = [
 ];
 const { variants: variants$e, withObservedValues: withObservedValues$c } = pickAriaComponentVariants(CHECKBOX_VARIANTS);
 function BaseCheckbox(props) {
-  const _a = props, { children, plasmicUpdateVariant, setControlContextData } = _a, rest = __objRest$m(_a, ["children", "plasmicUpdateVariant", "setControlContextData"]);
+  const _a = props, { children, plasmicUpdateVariant, setControlContextData } = _a, rest = __objRest$n(_a, ["children", "plasmicUpdateVariant", "setControlContextData"]);
   const contextProps = React.useContext(PlasmicCheckboxGroupContext);
   setControlContextData == null ? void 0 : setControlContextData({
     parent: contextProps
@@ -770,7 +774,7 @@ function registerCheckbox(loader, overrides) {
       importPath: "@plasmicpkgs/react-aria/skinny/registerCheckbox",
       importName: "BaseCheckbox",
       variants: variants$e,
-      props: __spreadProps$f(__spreadValues$p({}, getCommonProps("checkbox", [
+      props: __spreadProps$e(__spreadValues$p({}, getCommonProps("checkbox", [
         "name",
         "isDisabled",
         "isReadOnly",
@@ -839,8 +843,8 @@ function registerCheckbox(loader, overrides) {
 }
 
 var __defProp$o = Object.defineProperty;
-var __defProps$e = Object.defineProperties;
-var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
+var __defProps$d = Object.defineProperties;
+var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$o = Object.getOwnPropertySymbols;
 var __hasOwnProp$o = Object.prototype.hasOwnProperty;
 var __propIsEnum$o = Object.prototype.propertyIsEnumerable;
@@ -856,8 +860,8 @@ var __spreadValues$o = (a, b) => {
     }
   return a;
 };
-var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
-var __objRest$l = (source, exclude) => {
+var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
+var __objRest$m = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$o.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -870,8 +874,8 @@ var __objRest$l = (source, exclude) => {
   return target;
 };
 function BaseText(_a) {
-  var _b = _a, { children, slot, className } = _b, rest = __objRest$l(_b, ["children", "slot", "className"]);
-  return /* @__PURE__ */ React.createElement(Text, __spreadProps$e(__spreadValues$o({}, extractPlasmicDataProps(rest)), { slot, className }), children);
+  var _b = _a, { children, slot, className } = _b, rest = __objRest$m(_b, ["children", "slot", "className"]);
+  return /* @__PURE__ */ React.createElement(Text, __spreadProps$d(__spreadValues$o({}, extractPlasmicDataProps(rest)), { slot, className }), children);
 }
 const TEXT_COMPONENT_NAME = makeComponentName("text");
 function registerText(loader, overrides) {
@@ -906,8 +910,8 @@ function registerText(loader, overrides) {
 }
 
 var __defProp$n = Object.defineProperty;
-var __defProps$d = Object.defineProperties;
-var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
+var __defProps$c = Object.defineProperties;
+var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$n = Object.getOwnPropertySymbols;
 var __hasOwnProp$n = Object.prototype.hasOwnProperty;
 var __propIsEnum$n = Object.prototype.propertyIsEnumerable;
@@ -923,10 +927,10 @@ var __spreadValues$n = (a, b) => {
     }
   return a;
 };
-var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
+var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
 const DESCRIPTION_COMPONENT_NAME = makeComponentName("description");
 function registerDescription(loader, overrides) {
-  return registerText(loader, __spreadProps$d(__spreadValues$n({}, overrides), {
+  return registerText(loader, __spreadProps$c(__spreadValues$n({}, overrides), {
     name: DESCRIPTION_COMPONENT_NAME,
     displayName: "Aria Description",
     props: {
@@ -955,7 +959,7 @@ var __spreadValues$m = (a, b) => {
     }
   return a;
 };
-var __objRest$k = (source, exclude) => {
+var __objRest$l = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$m.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -979,7 +983,7 @@ function BaseFieldError(_a) {
     tooShort,
     typeMismatch,
     valueMissing
-  } = _b, rest = __objRest$k(_b, [
+  } = _b, rest = __objRest$l(_b, [
     "badInput",
     "customError",
     "patternMismatch",
@@ -1099,8 +1103,8 @@ function registerFieldError(loader, overrides) {
 }
 
 var __defProp$l = Object.defineProperty;
-var __defProps$c = Object.defineProperties;
-var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
+var __defProps$b = Object.defineProperties;
+var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$l = Object.getOwnPropertySymbols;
 var __hasOwnProp$l = Object.prototype.hasOwnProperty;
 var __propIsEnum$l = Object.prototype.propertyIsEnumerable;
@@ -1116,8 +1120,8 @@ var __spreadValues$l = (a, b) => {
     }
   return a;
 };
-var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
-var __objRest$j = (source, exclude) => {
+var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
+var __objRest$k = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$l.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -1130,8 +1134,8 @@ var __objRest$j = (source, exclude) => {
   return target;
 };
 function BaseLabel(_a) {
-  var _b = _a, { children, className } = _b, rest = __objRest$j(_b, ["children", "className"]);
-  return /* @__PURE__ */ React.createElement(Label, __spreadProps$c(__spreadValues$l({}, extractPlasmicDataProps(rest)), { className }), children);
+  var _b = _a, { children, className } = _b, rest = __objRest$k(_b, ["children", "className"]);
+  return /* @__PURE__ */ React.createElement(Label, __spreadProps$b(__spreadValues$l({}, extractPlasmicDataProps(rest)), { className }), children);
 }
 const LABEL_COMPONENT_NAME = makeComponentName("label");
 function registerLabel(loader, overrides) {
@@ -1163,8 +1167,8 @@ function registerLabel(loader, overrides) {
 }
 
 var __defProp$k = Object.defineProperty;
-var __defProps$b = Object.defineProperties;
-var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
+var __defProps$a = Object.defineProperties;
+var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
 var __hasOwnProp$k = Object.prototype.hasOwnProperty;
 var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
@@ -1180,8 +1184,8 @@ var __spreadValues$k = (a, b) => {
     }
   return a;
 };
-var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
-var __objRest$i = (source, exclude) => {
+var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
+var __objRest$j = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$k.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -1198,7 +1202,7 @@ const { variants: variants$d, withObservedValues: withObservedValues$b } = pickA
   CHECKBOX_GROUP_VARIANTS
 );
 function BaseCheckboxGroup(props) {
-  const _a = props, { children, plasmicUpdateVariant } = _a, rest = __objRest$i(_a, ["children", "plasmicUpdateVariant"]);
+  const _a = props, { children, plasmicUpdateVariant } = _a, rest = __objRest$j(_a, ["children", "plasmicUpdateVariant"]);
   return /* @__PURE__ */ React.createElement(PlasmicCheckboxGroupContext.Provider, { value: rest }, /* @__PURE__ */ React.createElement(CheckboxGroup, __spreadValues$k({}, rest), ({ isDisabled, isReadOnly }) => withObservedValues$b(
     children,
     {
@@ -1228,7 +1232,7 @@ function registerCheckboxGroup(loader, overrides) {
       importPath: "@plasmicpkgs/react-aria/skinny/registerCheckboxGroup",
       importName: "BaseCheckboxGroup",
       variants: variants$d,
-      props: __spreadProps$b(__spreadValues$k({}, getCommonProps("checkbox group", [
+      props: __spreadProps$a(__spreadValues$k({}, getCommonProps("checkbox group", [
         "name",
         "isDisabled",
         "isReadOnly",
@@ -1409,7 +1413,7 @@ var __spreadValues$j = (a, b) => {
     }
   return a;
 };
-var __objRest$h = (source, exclude) => {
+var __objRest$i = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$j.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -1444,7 +1448,7 @@ function BaseInput(props) {
     disabled,
     autoComplete,
     value
-  } = _a, rest = __objRest$h(_a, [
+  } = _a, rest = __objRest$i(_a, [
     "plasmicUpdateVariant",
     "setControlContextData",
     "disabled",
@@ -1579,7 +1583,7 @@ var __spreadValues$i = (a, b) => {
     }
   return a;
 };
-var __objRest$g = (source, exclude) => {
+var __objRest$h = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$i.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -1603,7 +1607,7 @@ const { variants: variants$b, withObservedValues: withObservedValues$a } = pickA
   LIST_BOX_ITEM_VARIANTS
 );
 function BaseListBoxItem(props) {
-  const _a = props, { children, setControlContextData, plasmicUpdateVariant, id } = _a, rest = __objRest$g(_a, ["children", "setControlContextData", "plasmicUpdateVariant", "id"]);
+  const _a = props, { children, setControlContextData, plasmicUpdateVariant, id } = _a, rest = __objRest$h(_a, ["children", "setControlContextData", "plasmicUpdateVariant", "id"]);
   const listboxContext = React.useContext(PlasmicListBoxContext);
   const isStandalone = !listboxContext;
   const [registeredId, setRegisteredId] = useState();
@@ -1752,7 +1756,7 @@ var __spreadValues$h = (a, b) => {
     }
   return a;
 };
-var __objRest$f = (source, exclude) => {
+var __objRest$g = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$h.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -1765,7 +1769,7 @@ var __objRest$f = (source, exclude) => {
   return target;
 };
 function BaseSection(props) {
-  const _a = props, { header, items } = _a, rest = __objRest$f(_a, ["header", "items"]);
+  const _a = props, { header, items } = _a, rest = __objRest$g(_a, ["header", "items"]);
   const contextProps = React.useContext(PlasmicListBoxContext);
   const mergedProps = mergeProps$1(contextProps, rest);
   return /* @__PURE__ */ React.createElement(Section, __spreadValues$h({}, mergedProps), /* @__PURE__ */ React.createElement(Header, null, header), items);
@@ -1821,7 +1825,7 @@ var __spreadValues$g = (a, b) => {
     }
   return a;
 };
-var __objRest$e = (source, exclude) => {
+var __objRest$f = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$g.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -1851,7 +1855,7 @@ function BaseListBox(props) {
     children,
     selectedKeys,
     defaultSelectedKeys
-  } = _a, rest = __objRest$e(_a, [
+  } = _a, rest = __objRest$f(_a, [
     "setControlContextData",
     "children",
     "selectedKeys",
@@ -2083,7 +2087,7 @@ var __spreadValues$f = (a, b) => {
     }
   return a;
 };
-var __objRest$d = (source, exclude) => {
+var __objRest$e = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$f.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -2103,7 +2107,7 @@ const POPOVER_VARIANTS = [
 ];
 const { variants: variants$a, withObservedValues: withObservedValues$9 } = pickAriaComponentVariants(POPOVER_VARIANTS);
 function BasePopover(props) {
-  const _a = props, { resetClassName, plasmicUpdateVariant } = _a, restProps = __objRest$d(_a, ["resetClassName", "plasmicUpdateVariant"]);
+  const _a = props, { resetClassName, plasmicUpdateVariant } = _a, restProps = __objRest$e(_a, ["resetClassName", "plasmicUpdateVariant"]);
   const isStandalone = !React.useContext(PopoverContext);
   const context = React.useContext(PlasmicPopoverContext);
   const triggerRef = React.useRef(null);
@@ -2125,7 +2129,7 @@ function BasePopover(props) {
       // In component view, we never want to start with an empty artboard, so isOpen has to be true
       isOpen: true
     } : null
-  ), { children } = _b, mergedProps = __objRest$d(_b, ["children"]);
+  ), { children } = _b, mergedProps = __objRest$e(_b, ["children"]);
   return /* @__PURE__ */ React.createElement(React.Fragment, null, isStandalone && /* @__PURE__ */ React.createElement("div", { ref: triggerRef }), /* @__PURE__ */ React.createElement(Popover, __spreadValues$f({}, mergedProps), ({ placement }) => withObservedValues$9(
     children,
     {
@@ -2237,8 +2241,8 @@ function registerPopover(loader, overrides) {
 }
 
 var __defProp$e = Object.defineProperty;
-var __defProps$a = Object.defineProperties;
-var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
+var __defProps$9 = Object.defineProperties;
+var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
 var __hasOwnProp$e = Object.prototype.hasOwnProperty;
 var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
@@ -2254,8 +2258,8 @@ var __spreadValues$e = (a, b) => {
     }
   return a;
 };
-var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
-var __objRest$c = (source, exclude) => {
+var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
+var __objRest$d = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$e.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -2268,6 +2272,8 @@ var __objRest$c = (source, exclude) => {
   return target;
 };
 const COMBOBOX_NAME = makeComponentName("combobox");
+const COMBOBOX_VARIANTS = ["disabled"];
+const { variants: COMBOBOX_VARIANTS_DATA } = pickAriaComponentVariants(COMBOBOX_VARIANTS);
 function ComboboxAutoOpen(props) {
   var _a;
   const { open, close } = (_a = React.useContext(ComboBoxStateContext)) != null ? _a : {};
@@ -2278,10 +2284,16 @@ function BaseComboBox(props) {
   const _a = props, {
     children,
     setControlContextData,
+    plasmicUpdateVariant,
+    className,
+    isDisabled,
     isOpen: _isOpen
-  } = _a, rest = __objRest$c(_a, [
+  } = _a, rest = __objRest$d(_a, [
     "children",
     "setControlContextData",
+    "plasmicUpdateVariant",
+    "className",
+    "isDisabled",
     "isOpen"
   ]);
   const idManager = useMemo(() => new ListBoxItemIdManager(), []);
@@ -2292,15 +2304,27 @@ function BaseComboBox(props) {
       });
     });
   }, []);
-  return /* @__PURE__ */ React.createElement(ComboBox, __spreadValues$e({}, rest), /* @__PURE__ */ React.createElement(PlasmicPopoverContext.Provider, { value: {} }, /* @__PURE__ */ React.createElement(
-    PlasmicListBoxContext.Provider,
-    {
-      value: {
-        idManager
-      }
-    },
-    /* @__PURE__ */ React.createElement(PlasmicInputContext.Provider, { value: { isUncontrolled: true } }, /* @__PURE__ */ React.createElement(ComboboxAutoOpen, __spreadValues$e({}, props)), children)
-  )));
+  useEffect(() => {
+    plasmicUpdateVariant == null ? void 0 : plasmicUpdateVariant({
+      disabled: isDisabled
+    });
+  }, [isDisabled, plasmicUpdateVariant]);
+  return /* @__PURE__ */ React.createElement(
+    ComboBox,
+    __spreadValues$e({
+      isDisabled,
+      className
+    }, rest),
+    /* @__PURE__ */ React.createElement(PlasmicPopoverContext.Provider, { value: {} }, /* @__PURE__ */ React.createElement(
+      PlasmicListBoxContext.Provider,
+      {
+        value: {
+          idManager
+        }
+      },
+      /* @__PURE__ */ React.createElement(PlasmicInputContext.Provider, { value: { isUncontrolled: true } }, /* @__PURE__ */ React.createElement(ComboboxAutoOpen, __spreadValues$e({}, props)), children)
+    ))
+  );
 }
 function registerComboBox(loader) {
   registerComponentHelper(loader, BaseComboBox, {
@@ -2308,7 +2332,8 @@ function registerComboBox(loader) {
     displayName: "Aria ComboBox",
     importPath: "@plasmicpkgs/react-aria/skinny/registerComboBox",
     importName: "BaseComboBox",
-    props: __spreadProps$a(__spreadValues$e({}, getCommonProps("ComboBox", [
+    variants: COMBOBOX_VARIANTS_DATA,
+    props: __spreadProps$9(__spreadValues$e({}, getCommonProps("ComboBox", [
       "name",
       "aria-label",
       "placeholder",
@@ -2458,7 +2483,7 @@ var __spreadValues$d = (a, b) => {
     }
   return a;
 };
-var __objRest$b = (source, exclude) => {
+var __objRest$c = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$d.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -2471,7 +2496,7 @@ var __objRest$b = (source, exclude) => {
   return target;
 };
 function BaseHeading(_a) {
-  var _b = _a, { children } = _b, rest = __objRest$b(_b, ["children"]);
+  var _b = _a, { children } = _b, rest = __objRest$c(_b, ["children"]);
   return /* @__PURE__ */ React.createElement(Heading, __spreadValues$d({}, rest), children);
 }
 const HEADING_COMPONENT_NAME = makeComponentName("heading");
@@ -2511,8 +2536,8 @@ function registerHeading(loader, overrides) {
 }
 
 var __defProp$c = Object.defineProperty;
-var __defProps$9 = Object.defineProperties;
-var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
+var __defProps$8 = Object.defineProperties;
+var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$c = Object.getOwnPropertySymbols;
 var __hasOwnProp$c = Object.prototype.hasOwnProperty;
 var __propIsEnum$c = Object.prototype.propertyIsEnumerable;
@@ -2528,8 +2553,8 @@ var __spreadValues$c = (a, b) => {
     }
   return a;
 };
-var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
-var __objRest$a = (source, exclude) => {
+var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
+var __objRest$b = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$c.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -2555,7 +2580,7 @@ const BaseModal = forwardRef(
       resetClassName,
       setControlContextData,
       isDismissable
-    } = _a, rest = __objRest$a(_a, [
+    } = _a, rest = __objRest$b(_a, [
       "children",
       "modalOverlayClass",
       "className",
@@ -2597,7 +2622,7 @@ const BaseModal = forwardRef(
     const bodyInPreview = /* @__PURE__ */ React.createElement(Dialog, { style: INLINE_STYLES }, children);
     return /* @__PURE__ */ React.createElement(
       ModalOverlay,
-      __spreadProps$9(__spreadValues$c({}, mergedProps), {
+      __spreadProps$8(__spreadValues$c({}, mergedProps), {
         className: `${resetClassName} ${modalOverlayClass}`
       }),
       /* @__PURE__ */ React.createElement(Modal, { className }, isCanvas ? bodyInCanvas : bodyInPreview)
@@ -2719,8 +2744,8 @@ function registerModal(loader, overrides) {
 }
 
 var __defProp$b = Object.defineProperty;
-var __defProps$8 = Object.defineProperties;
-var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
+var __defProps$7 = Object.defineProperties;
+var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
 var __hasOwnProp$b = Object.prototype.hasOwnProperty;
 var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
@@ -2736,8 +2761,8 @@ var __spreadValues$b = (a, b) => {
     }
   return a;
 };
-var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
-var __objRest$9 = (source, exclude) => {
+var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
+var __objRest$a = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$b.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -2751,10 +2776,10 @@ var __objRest$9 = (source, exclude) => {
 };
 function BaseDialogTrigger(props) {
   var _b, _c;
-  const _a = props, { trigger, dialog, isOpen } = _a, rest = __objRest$9(_a, ["trigger", "dialog", "isOpen"]);
+  const _a = props, { trigger, dialog, isOpen } = _a, rest = __objRest$a(_a, ["trigger", "dialog", "isOpen"]);
   const { isSelected, selectedSlotName } = (_b = usePlasmicCanvasComponentInfo(props)) != null ? _b : {};
   const isAutoOpen = selectedSlotName !== "trigger" && isSelected;
-  const mergedProps = __spreadProps$8(__spreadValues$b({}, rest), {
+  const mergedProps = __spreadProps$7(__spreadValues$b({}, rest), {
     isOpen: (_c = isAutoOpen || isOpen) != null ? _c : false
   });
   return /* @__PURE__ */ React.createElement(PlasmicDialogTriggerContext.Provider, { value: mergedProps }, /* @__PURE__ */ React.createElement(DialogTrigger, __spreadValues$b({}, mergedProps), trigger, dialog));
@@ -2819,8 +2844,8 @@ function registerDialogTrigger(loader, overrides) {
 }
 
 var __defProp$a = Object.defineProperty;
-var __defProps$7 = Object.defineProperties;
-var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
+var __defProps$6 = Object.defineProperties;
+var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$a = Object.getOwnPropertySymbols;
 var __hasOwnProp$a = Object.prototype.hasOwnProperty;
 var __propIsEnum$a = Object.prototype.propertyIsEnumerable;
@@ -2836,8 +2861,8 @@ var __spreadValues$a = (a, b) => {
     }
   return a;
 };
-var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
-var __objRest$8 = (source, exclude) => {
+var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
+var __objRest$9 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$a.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -2861,7 +2886,7 @@ const RADIO_VARIANTS = [
 ];
 const { variants: variants$9, withObservedValues: withObservedValues$8 } = pickAriaComponentVariants(RADIO_VARIANTS);
 function BaseRadio(props) {
-  const _a = props, { children, setControlContextData, plasmicUpdateVariant } = _a, rest = __objRest$8(_a, ["children", "setControlContextData", "plasmicUpdateVariant"]);
+  const _a = props, { children, setControlContextData, plasmicUpdateVariant } = _a, rest = __objRest$9(_a, ["children", "setControlContextData", "plasmicUpdateVariant"]);
   const contextProps = React.useContext(PlasmicRadioGroupContext);
   const isStandalone = !contextProps;
   setControlContextData == null ? void 0 : setControlContextData({
@@ -2935,7 +2960,7 @@ function registerRadio(loader, overrides) {
       importPath: "@plasmicpkgs/react-aria/skinny/registerRadio",
       importName: "BaseRadio",
       variants: variants$9,
-      props: __spreadProps$7(__spreadValues$a({}, getCommonProps("radio", [
+      props: __spreadProps$6(__spreadValues$a({}, getCommonProps("radio", [
         "isDisabled",
         "autoFocus",
         "aria-label"
@@ -2957,8 +2982,8 @@ function registerRadio(loader, overrides) {
 }
 
 var __defProp$9 = Object.defineProperty;
-var __defProps$6 = Object.defineProperties;
-var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
+var __defProps$5 = Object.defineProperties;
+var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
 var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
 var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
@@ -2974,8 +2999,8 @@ var __spreadValues$9 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
-var __objRest$7 = (source, exclude) => {
+var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
+var __objRest$8 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$9.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -2990,7 +3015,7 @@ var __objRest$7 = (source, exclude) => {
 const RADIO_GROUP_VARIANTS = ["disabled", "readonly"];
 const { variants: variants$8, withObservedValues: withObservedValues$7 } = pickAriaComponentVariants(RADIO_GROUP_VARIANTS);
 function BaseRadioGroup(props) {
-  const _a = props, { children, plasmicUpdateVariant } = _a, rest = __objRest$7(_a, ["children", "plasmicUpdateVariant"]);
+  const _a = props, { children, plasmicUpdateVariant } = _a, rest = __objRest$8(_a, ["children", "plasmicUpdateVariant"]);
   return /* @__PURE__ */ React.createElement(PlasmicRadioGroupContext.Provider, { value: props }, /* @__PURE__ */ React.createElement(RadioGroup, __spreadValues$9({}, rest), ({ isDisabled, isReadOnly }) => withObservedValues$7(
     children,
     {
@@ -3018,7 +3043,7 @@ function registerRadioGroup(loader, overrides) {
       importPath: "@plasmicpkgs/react-aria/skinny/registerRadioGroup",
       importName: "BaseRadioGroup",
       variants: variants$8,
-      props: __spreadProps$6(__spreadValues$9({}, getCommonProps("radio group", [
+      props: __spreadProps$5(__spreadValues$9({}, getCommonProps("radio group", [
         "name",
         "isDisabled",
         "isReadOnly",
@@ -3124,8 +3149,8 @@ function registerRadioGroup(loader, overrides) {
 }
 
 var __defProp$8 = Object.defineProperty;
-var __defProps$5 = Object.defineProperties;
-var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
 var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
 var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
@@ -3141,7 +3166,7 @@ var __spreadValues$8 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 function SelectAutoOpen(props) {
   var _a;
   const { open, close } = (_a = React.useContext(SelectStateContext)) != null ? _a : {};
@@ -3154,6 +3179,8 @@ const BaseSelectValue = (props) => {
   return /* @__PURE__ */ React.createElement(SelectValue, { className }, ({ isPlaceholder, selectedText }) => /* @__PURE__ */ React.createElement(React.Fragment, null, isPlaceholder ? placeholder : selectedText));
 };
 const SELECT_NAME = makeComponentName("select");
+const SELECT_VARIANTS = ["disabled"];
+const { variants: SELECT_VARIANTS_DATA } = pickAriaComponentVariants(SELECT_VARIANTS);
 function BaseSelect(props) {
   const {
     selectedKey,
@@ -3167,9 +3194,10 @@ function BaseSelect(props) {
     disabledKeys,
     name,
     setControlContextData,
+    plasmicUpdateVariant,
     "aria-label": ariaLabel
   } = props;
-  let idManager = useMemo(() => new ListBoxItemIdManager(), []);
+  const idManager = useMemo(() => new ListBoxItemIdManager(), []);
   useEffect(() => {
     idManager.subscribe((ids) => {
       setControlContextData == null ? void 0 : setControlContextData({
@@ -3177,6 +3205,11 @@ function BaseSelect(props) {
       });
     });
   }, []);
+  useEffect(() => {
+    plasmicUpdateVariant == null ? void 0 : plasmicUpdateVariant({
+      disabled: isDisabled
+    });
+  }, [isDisabled, plasmicUpdateVariant]);
   return /* @__PURE__ */ React.createElement(
     Select,
     __spreadValues$8({
@@ -3233,7 +3266,8 @@ function registerSelect(loader) {
     displayName: "Aria Select",
     importPath: "@plasmicpkgs/react-aria/skinny/registerSelect",
     importName: "BaseSelect",
-    props: __spreadProps$5(__spreadValues$8({}, getCommonProps("Select", [
+    variants: SELECT_VARIANTS_DATA,
+    props: __spreadProps$4(__spreadValues$8({}, getCommonProps("Select", [
       "name",
       "aria-label",
       "placeholder",
@@ -3390,7 +3424,7 @@ var __spreadValues$7 = (a, b) => {
     }
   return a;
 };
-var __objRest$6 = (source, exclude) => {
+var __objRest$7 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$7.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -3407,7 +3441,7 @@ const { variants: variants$7, withObservedValues: withObservedValues$6 } = pickA
   SLIDER_OUTPUT_VARIANTS
 );
 function BaseSliderOutput(props) {
-  const _a = props, { plasmicUpdateVariant, children } = _a, rest = __objRest$6(_a, ["plasmicUpdateVariant", "children"]);
+  const _a = props, { plasmicUpdateVariant, children } = _a, rest = __objRest$7(_a, ["plasmicUpdateVariant", "children"]);
   return /* @__PURE__ */ React.createElement(SliderOutput, __spreadValues$7({}, rest), ({ isDisabled }) => withObservedValues$6(
     children,
     {
@@ -3456,8 +3490,8 @@ class ErrorBoundary extends Component {
 }
 
 var __defProp$6 = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __defProps$3 = Object.defineProperties;
+var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
 var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
 var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
@@ -3473,8 +3507,8 @@ var __spreadValues$6 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
-var __objRest$5 = (source, exclude) => {
+var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+var __objRest$6 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$6.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -3501,7 +3535,7 @@ function BaseSliderThumb(_a) {
     children,
     advanced,
     plasmicUpdateVariant
-  } = _b, rest = __objRest$5(_b, [
+  } = _b, rest = __objRest$6(_b, [
     "children",
     "advanced",
     "plasmicUpdateVariant"
@@ -3547,7 +3581,7 @@ function registerSliderThumb(loader, overrides) {
         cursor: "pointer"
       },
       variants: variants$6,
-      props: __spreadProps$4(__spreadValues$6({}, getCommonProps("slider thumb", [
+      props: __spreadProps$3(__spreadValues$6({}, getCommonProps("slider thumb", [
         "name",
         "isDisabled",
         "autoFocus"
@@ -3585,7 +3619,7 @@ var __spreadValues$5 = (a, b) => {
     }
   return a;
 };
-var __objRest$4 = (source, exclude) => {
+var __objRest$5 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$5.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -3623,7 +3657,7 @@ function BaseSliderTrack(props) {
   const context = React.useContext(PlasmicSliderContext);
   const isStandalone = !context;
   const mergedProps = mergeProps(context, props);
-  const _a = mergedProps, { children, progressBar, plasmicUpdateVariant } = _a, rest = __objRest$4(_a, ["children", "progressBar", "plasmicUpdateVariant"]);
+  const _a = mergedProps, { children, progressBar, plasmicUpdateVariant } = _a, rest = __objRest$5(_a, ["children", "progressBar", "plasmicUpdateVariant"]);
   const isMultiValue = isMultiValueGuard(mergedProps.value);
   const { minIndex, maxIndex } = useMemo(() => {
     if (!context || !Array.isArray(context.value) || context.value.length <= 1) {
@@ -3751,8 +3785,8 @@ function registerSliderTrack(sliderThumbMeta, loader, overrides) {
 }
 
 var __defProp$4 = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+var __defProps$2 = Object.defineProperties;
+var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
 var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
 var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
@@ -3768,8 +3802,8 @@ var __spreadValues$4 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
-var __objRest$3 = (source, exclude) => {
+var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
+var __objRest$4 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$4.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -3786,11 +3820,11 @@ const RANGE_SLIDER_COMPONENT_NAME = makeComponentName("range-slider");
 const SLIDER_VARIANTS = ["disabled"];
 const { variants: variants$4, withObservedValues: withObservedValues$3 } = pickAriaComponentVariants(SLIDER_VARIANTS);
 function BaseSlider(props) {
-  const _a = props, { children, plasmicUpdateVariant } = _a, rest = __objRest$3(_a, ["children", "plasmicUpdateVariant"]);
+  const _a = props, { children, plasmicUpdateVariant } = _a, rest = __objRest$4(_a, ["children", "plasmicUpdateVariant"]);
   return /* @__PURE__ */ React.createElement(
     PlasmicSliderContext.Provider,
     {
-      value: __spreadProps$3(__spreadValues$4({}, rest), {
+      value: __spreadProps$2(__spreadValues$4({}, rest), {
         // Here's why the type casting is needed here: https://github.com/Microsoft/TypeScript/issues/3410
         onChange: rest.onChange,
         onChangeEnd: rest.onChangeEnd
@@ -3852,7 +3886,7 @@ function registerSlider(loader, overrides) {
       defaultStyles: {
         width: "300px"
       },
-      props: __spreadProps$3(__spreadValues$4(__spreadValues$4({}, getCommonProps("slider", [
+      props: __spreadProps$2(__spreadValues$4(__spreadValues$4({}, getCommonProps("slider", [
         "isDisabled",
         "aria-label"
       ])), getCommonSliderProps()), {
@@ -3964,7 +3998,7 @@ function registerSlider(loader, overrides) {
       defaultStyles: {
         width: "300px"
       },
-      props: __spreadProps$3(__spreadValues$4(__spreadValues$4({}, getCommonProps("slider", [
+      props: __spreadProps$2(__spreadValues$4(__spreadValues$4({}, getCommonProps("slider", [
         "isDisabled",
         "aria-label"
       ])), getCommonSliderProps()), {
@@ -4040,8 +4074,8 @@ function registerSlider(loader, overrides) {
 }
 
 var __defProp$3 = Object.defineProperty;
-var __defProps$2 = Object.defineProperties;
-var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
+var __defProps$1 = Object.defineProperties;
+var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
 var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
 var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
@@ -4057,8 +4091,8 @@ var __spreadValues$3 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
-var __objRest$2 = (source, exclude) => {
+var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+var __objRest$3 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$3.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -4081,7 +4115,7 @@ const SWITCH_VARIANTS = [
 ];
 const { variants: variants$3, withObservedValues: withObservedValues$2 } = pickAriaComponentVariants(SWITCH_VARIANTS);
 function BaseSwitch(props) {
-  const _a = props, { children, plasmicUpdateVariant } = _a, rest = __objRest$2(_a, ["children", "plasmicUpdateVariant"]);
+  const _a = props, { children, plasmicUpdateVariant } = _a, rest = __objRest$3(_a, ["children", "plasmicUpdateVariant"]);
   return /* @__PURE__ */ React.createElement(Switch, __spreadValues$3({}, rest), ({
     isHovered,
     isPressed,
@@ -4121,7 +4155,7 @@ function registerSwitch(loader, overrides) {
         justifyContent: "flex-start",
         padding: 0
       },
-      props: __spreadProps$2(__spreadValues$3({}, getCommonProps("switch", [
+      props: __spreadProps$1(__spreadValues$3({}, getCommonProps("switch", [
         "name",
         "isDisabled",
         "isReadOnly",
@@ -4247,7 +4281,7 @@ var __spreadValues$2 = (a, b) => {
     }
   return a;
 };
-var __objRest$1 = (source, exclude) => {
+var __objRest$2 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$2.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -4276,7 +4310,7 @@ const inputHelpers = {
 };
 function BaseTextArea(props) {
   var _b;
-  const _a = props, { disabled, plasmicUpdateVariant, setControlContextData } = _a, rest = __objRest$1(_a, ["disabled", "plasmicUpdateVariant", "setControlContextData"]);
+  const _a = props, { disabled, plasmicUpdateVariant, setControlContextData } = _a, rest = __objRest$2(_a, ["disabled", "plasmicUpdateVariant", "setControlContextData"]);
   const textFieldContext = React.useContext(PlasmicTextFieldContext);
   const mergedProps = mergeProps(rest, {
     disabled: (_b = textFieldContext == null ? void 0 : textFieldContext.isDisabled) != null ? _b : disabled
@@ -4366,8 +4400,8 @@ function registerTextArea(loader, overrides) {
 }
 
 var __defProp$1 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
 var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
 var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
@@ -4383,8 +4417,8 @@ var __spreadValues$1 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
-var __objRest = (source, exclude) => {
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest$1 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$1.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -4399,7 +4433,7 @@ var __objRest = (source, exclude) => {
 const TEXT_FIELD_VARIANTS = ["disabled", "readonly"];
 const { variants: variants$1, withObservedValues: withObservedValues$1 } = pickAriaComponentVariants(TEXT_FIELD_VARIANTS);
 function BaseTextField(props) {
-  const _a = props, { children, plasmicUpdateVariant, autoComplete } = _a, rest = __objRest(_a, ["children", "plasmicUpdateVariant", "autoComplete"]);
+  const _a = props, { children, plasmicUpdateVariant, autoComplete } = _a, rest = __objRest$1(_a, ["children", "plasmicUpdateVariant", "autoComplete"]);
   return /* @__PURE__ */ React.createElement(PlasmicTextFieldContext.Provider, { value: props }, /* @__PURE__ */ React.createElement(TextField, __spreadValues$1({ autoComplete: resolveAutoComplete(autoComplete) }, rest), ({ isDisabled, isReadOnly }) => withObservedValues$1(
     children,
     {
@@ -4421,7 +4455,7 @@ function registerTextField(loader, overrides) {
       importName: "BaseTextField",
       variants: variants$1,
       // TODO: Support for validate prop
-      props: __spreadProps$1(__spreadValues$1({}, getCommonProps("Text Field", [
+      props: __spreadProps(__spreadValues$1({}, getCommonProps("Text Field", [
         "name",
         "isDisabled",
         "isReadOnly",
@@ -4530,8 +4564,6 @@ function registerTextField(loader, overrides) {
 }
 
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -4547,11 +4579,18 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-function isForwardRefComponent(element) {
-  var _a;
-  return ((_a = element == null ? void 0 : element.type) == null ? void 0 : _a.$$typeof) === Symbol.for("react.forward_ref");
-}
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 const TOOLTIP_VARIANTS = [
   "placementTop",
   "placementBottom",
@@ -4559,16 +4598,15 @@ const TOOLTIP_VARIANTS = [
   "placementRight"
 ];
 const { variants, withObservedValues } = pickAriaComponentVariants(TOOLTIP_VARIANTS);
-function TooltipButton(props) {
+function TriggerWrapper(_a) {
+  var _b = _a, {
+    children
+  } = _b, rest = __objRest(_b, [
+    "children"
+  ]);
   const ref = React.useRef(null);
-  const { buttonProps } = useButton(props, ref);
-  const { children } = props;
-  if (!isForwardRefComponent(children)) {
-    return children;
-  }
-  return React.cloneElement(children, __spreadProps(__spreadValues({}, buttonProps), {
-    ref
-  }));
+  const { focusableProps } = useFocusable(rest, ref);
+  return /* @__PURE__ */ React.createElement("div", __spreadValues({ ref }, focusableProps), children);
 }
 function BaseTooltip(props) {
   var _a;
@@ -4592,7 +4630,6 @@ function BaseTooltip(props) {
   } = props;
   const { isSelected, selectedSlotName } = (_a = usePlasmicCanvasComponentInfo(props)) != null ? _a : {};
   const isAutoOpen = selectedSlotName !== "children" && isSelected;
-  const focusableChild = flattenChildren(children)[0];
   const _isOpen = isAutoOpen || isOpen;
   return /* @__PURE__ */ React.createElement(
     TooltipTrigger,
@@ -4605,7 +4642,7 @@ function BaseTooltip(props) {
       defaultOpen,
       onOpenChange
     },
-    /* @__PURE__ */ React.createElement(TooltipButton, null, focusableChild),
+    /* @__PURE__ */ React.createElement(TriggerWrapper, null, children),
     /* @__PURE__ */ React.createElement(
       Tooltip,
       {