@plasmicpkgs/react-aria 0.0.27 → 0.0.28

package/dist/react-aria.js

@@ -84,7 +84,11 @@ const ARIA_COMPONENTS_INTERACTION_VARIANTS = {
     displayName: "Focus Visible"
   }
 };
-function realWithObservedValues(children, changes, updateInteractionVariant) {
+function ChangesObserver({
+  children,
+  changes,
+  updateInteractionVariant
+}) {
   React__default.default.useEffect(() => {
     if (updateInteractionVariant) {
       updateInteractionVariant(changes);
@@ -92,6 +96,16 @@ function realWithObservedValues(children, changes, updateInteractionVariant) {
   }, [changes, updateInteractionVariant]);
   return children;
 }
+function realWithObservedValues(children, changes, updateInteractionVariant) {
+  return /* @__PURE__ */ React__default.default.createElement(
+    ChangesObserver,
+    {
+      changes,
+      updateInteractionVariant
+    },
+    children
+  );
+}
 function pickAriaComponentVariants(keys) {
   return {
     interactionVariants: Object.fromEntries(
@@ -102,8 +116,8 @@ function pickAriaComponentVariants(keys) {
 }
 
 var __defProp$m = Object.defineProperty;
-var __defProps$d = Object.defineProperties;
-var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
+var __defProps$c = Object.defineProperties;
+var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
 var __hasOwnProp$m = Object.prototype.hasOwnProperty;
 var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
@@ -119,10 +133,10 @@ var __spreadValues$m = (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));
 function registerComponentHelper(loader, component, meta, overrides) {
   if (overrides) {
-    meta = __spreadProps$d(__spreadValues$m(__spreadValues$m({}, meta), overrides), {
+    meta = __spreadProps$c(__spreadValues$m(__spreadValues$m({}, meta), overrides), {
       props: __spreadValues$m(__spreadValues$m({}, meta.props), overrides.props)
     });
     if (overrides.parentComponentName) {
@@ -160,8 +174,8 @@ function withoutNils(array) {
 }
 
 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;
@@ -177,7 +191,7 @@ var __spreadValues$l = (a, b) => {
     }
   return a;
 };
-var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
+var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
 var __objRest$e = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -233,7 +247,7 @@ function registerButton(loader, overrides) {
       importPath: "@plasmicpkgs/react-aria/skinny/registerButton",
       importName: "BaseButton",
       interactionVariants: interactionVariants$5,
-      props: __spreadProps$c(__spreadValues$l({}, getCommonInputProps("button", [
+      props: __spreadProps$b(__spreadValues$l({}, getCommonInputProps("button", [
         "isDisabled",
         "aria-label",
         "children"
@@ -253,6 +267,10 @@ function registerButton(loader, overrides) {
           hidden: (ps) => Boolean(ps.submitsForm),
           description: "Whether clicking this button should reset the enclosing form.",
           advanced: true
+        },
+        onPress: {
+          type: "eventHandler",
+          argTypes: [{ name: "event", type: "object" }]
         }
       }),
       trapsFocus: true
@@ -262,8 +280,8 @@ function registerButton(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;
@@ -279,7 +297,7 @@ var __spreadValues$k = (a, b) => {
     }
   return a;
 };
-var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
+var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
 var __objRest$d = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -324,7 +342,7 @@ function registerCheckbox(loader, overrides) {
       importPath: "@plasmicpkgs/react-aria/skinny/registerCheckbox",
       importName: "BaseCheckbox",
       interactionVariants: interactionVariants$4,
-      props: __spreadProps$b(__spreadValues$k({}, getCommonInputProps("checkbox", [
+      props: __spreadProps$a(__spreadValues$k({}, getCommonInputProps("checkbox", [
         "name",
         "isDisabled",
         "isReadOnly",
@@ -437,8 +455,8 @@ function registerText(loader, overrides) {
 }
 
 var __defProp$i = Object.defineProperty;
-var __defProps$a = Object.defineProperties;
-var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
+var __defProps$9 = Object.defineProperties;
+var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
 var __hasOwnProp$i = Object.prototype.hasOwnProperty;
 var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
@@ -454,9 +472,9 @@ var __spreadValues$i = (a, b) => {
     }
   return a;
 };
-var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
+var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
 function registerDescription(loader, overrides) {
-  registerText(loader, __spreadProps$a(__spreadValues$i({}, overrides), {
+  registerText(loader, __spreadProps$9(__spreadValues$i({}, overrides), {
     displayName: "Aria Description",
     props: {
       slot: { type: "string", hidden: () => true, defaultValue: "description" }
@@ -635,8 +653,8 @@ function registerLabel(loader, overrides) {
 }
 
 var __defProp$g = Object.defineProperty;
-var __defProps$9 = Object.defineProperties;
-var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
+var __defProps$8 = Object.defineProperties;
+var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
 var __hasOwnProp$g = Object.prototype.hasOwnProperty;
 var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
@@ -652,7 +670,7 @@ var __spreadValues$g = (a, b) => {
     }
   return a;
 };
-var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
+var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
 const BaseCheckboxGroup = reactAriaComponents.CheckboxGroup;
 const componentName$2 = makeComponentName("checkboxGroup");
 function registerCheckboxGroup(loader, overrides) {
@@ -664,7 +682,7 @@ function registerCheckboxGroup(loader, overrides) {
       displayName: "Aria Checkbox Group",
       importPath: "@plasmicpkgs/react-aria/skinny/registerCheckboxGroup",
       importName: "BaseCheckboxGroup",
-      props: __spreadProps$9(__spreadValues$g({}, getCommonInputProps("checkbox group", [
+      props: __spreadProps$8(__spreadValues$g({}, getCommonInputProps("checkbox group", [
         "name",
         "isDisabled",
         "isReadOnly",
@@ -743,26 +761,26 @@ function deriveStrictOptions(props) {
       return void 0;
     } else if (typeof op === "string" || typeof op === "number") {
       const item = {
-        value: op
+        id: op
       };
       return item;
     } else if (optionInfo) {
       const info = optionInfo(op);
-      if (info.type === "section") {
+      if (info.type === "option-group") {
         const section = {
-          type: "section",
+          type: "option-group",
           items: (_c = (_b = (_a2 = info.items) == null ? void 0 : _a2.map) == null ? void 0 : _b.call(_a2, (item) => makeStrict(item))) == null ? void 0 : _c.filter((x) => !!x),
           label: info.label,
-          key: `section-${sectionCount}`
+          key: `option-group-${sectionCount}`
         };
         sectionCount += 1;
         return section;
       } else {
         let item = info;
-        if (!("value" in item)) {
+        if (!("id" in item)) {
           item = {
-            type: "item",
-            value: JSON.stringify(item)
+            type: "option",
+            id: JSON.stringify(item)
           };
         }
         return item;
@@ -770,19 +788,19 @@ function deriveStrictOptions(props) {
     } else if (typeof op === "object") {
       if ("items" in op) {
         const section = {
-          type: "section",
+          type: "option-group",
           items: (_f = (_e = (_d = op.items) == null ? void 0 : _d.map) == null ? void 0 : _e.call(_d, (item) => makeStrict(item))) == null ? void 0 : _f.filter((x) => !!x),
           label: op.label,
-          key: `section-${sectionCount}`
+          key: `option-group-${sectionCount}`
         };
         sectionCount += 1;
         return section;
       } else {
         let item = op;
-        if (!("value" in item)) {
+        if (!("id" in item)) {
           item = {
-            type: "item",
-            value: JSON.stringify(item)
+            type: "option",
+            id: JSON.stringify(item)
           };
         }
         return item;
@@ -794,7 +812,7 @@ function deriveStrictOptions(props) {
   const strictOptions = (_a = options == null ? void 0 : options.map(makeStrict)) == null ? void 0 : _a.filter((x) => !!x);
   const optionText = (op) => {
     var _a2;
-    return (_a2 = op.label) != null ? _a2 : op.value;
+    return (_a2 = op.label) != null ? _a2 : op.id;
   };
   return { options: strictOptions, optionText };
 }
@@ -805,7 +823,7 @@ function flattenOptions(options) {
     return options.flatMap(
       (op) => {
         var _a;
-        return op.type === "section" ? (_a = op.items) != null ? _a : [] : op;
+        return op.type === "option-group" ? (_a = op.items) != null ? _a : [] : op;
       }
     );
   }
@@ -815,7 +833,7 @@ function makeOptionsPropType() {
     type: "array",
     itemType: {
       type: "object",
-      nameFunc: (item) => item.label || item.value,
+      nameFunc: (item) => item.label || item.id,
       fields: {
         type: {
           type: "choice",
@@ -825,7 +843,7 @@ function makeOptionsPropType() {
           ],
           defaultValue: "option"
         },
-        value: {
+        id: {
           type: "string",
           hidden: (_ps, _ctx, { item }) => item.type !== "option"
         },
@@ -838,9 +856,9 @@ function makeOptionsPropType() {
           },
           itemType: {
             type: "object",
-            nameFunc: (item) => item.label || item.value,
+            nameFunc: (item) => item.label || item.id,
             fields: {
-              value: "string",
+              id: "string",
               label: "string"
             }
           }
@@ -849,12 +867,12 @@ function makeOptionsPropType() {
     },
     defaultValue: [
       {
-        value: "option1",
+        id: "option1",
         label: "Option 1",
         type: "option"
       },
       {
-        value: "option2",
+        id: "option2",
         label: "Option 2",
         type: "option"
       }
@@ -868,7 +886,7 @@ function makeValuePropType() {
     options: (ps) => {
       const { options, optionText } = deriveStrictOptions(ps);
       return flattenOptions(options).map((op) => ({
-        value: op.value,
+        value: op.id,
         label: optionText(op)
       }));
     }
@@ -877,8 +895,8 @@ function makeValuePropType() {
 }
 
 var __defProp$f = Object.defineProperty;
-var __defProps$8 = Object.defineProperties;
-var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
+var __defProps$7 = Object.defineProperties;
+var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
 var __hasOwnProp$f = Object.prototype.hasOwnProperty;
 var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
@@ -894,7 +912,7 @@ var __spreadValues$f = (a, b) => {
     }
   return a;
 };
-var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
+var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
 function BaseComboBox(props) {
   const {
     value,
@@ -926,8 +944,8 @@ function BaseComboBox(props) {
     const filterOptions = (opts) => {
       return withoutNils(
         opts.map((op) => {
-          if (op.type === "section") {
-            return __spreadProps$8(__spreadValues$f({}, op), {
+          if (op.type === "option-group") {
+            return __spreadProps$7(__spreadValues$f({}, op), {
               items: op.items ? filterOptions(op.items) : void 0
             });
           } else {
@@ -941,18 +959,18 @@ function BaseComboBox(props) {
       );
     };
     return filterOptions(options);
-  }, [options, filterValue, contains]);
+  }, [filterValue, options, contains, optionText]);
   const flattenedOptions = React__default.default.useMemo(
     () => flattenOptions(options),
     [options]
   );
-  const disabledKeys = flattenedOptions.filter((op) => op.isDisabled).map((op) => op.value);
+  const disabledKeys = flattenedOptions.filter((op) => op.isDisabled).map((op) => op.id);
   const onSelectionChange = React__default.default.useCallback(
     (key) => {
       if (key === null) {
         return;
       }
-      const selectedOption = flattenedOptions == null ? void 0 : flattenedOptions.find((op) => op.value === key);
+      const selectedOption = flattenedOptions == null ? void 0 : flattenedOptions.find((op) => op.id === key);
       if (valueType === "text") {
         if (selectedOption) {
           onChange == null ? void 0 : onChange(optionText(selectedOption));
@@ -964,7 +982,7 @@ function BaseComboBox(props) {
         onFilterValueChange == null ? void 0 : onFilterValueChange(optionText(selectedOption));
       }
     },
-    [onChange, onFilterValueChange, flattenedOptions, optionText]
+    [flattenedOptions, valueType, onChange, optionText, onFilterValueChange]
   );
   const onInputValueChange = React__default.default.useCallback(
     (newValue) => {
@@ -995,7 +1013,7 @@ function BaseComboBox(props) {
   const onBlur = React__default.default.useCallback(() => {
     if (!allowsCustomValue) {
       const selectedOption = flattenedOptions == null ? void 0 : flattenedOptions.find(
-        (op) => valueType === "text" ? optionText(op) === value : op.value === value
+        (op) => valueType === "text" ? optionText(op) === value : op.id === value
       );
       if (selectedOption) {
         const selectedOptionText = optionText(selectedOption);
@@ -1006,10 +1024,11 @@ function BaseComboBox(props) {
     }
   }, [
     allowsCustomValue,
-    valueType,
     flattenedOptions,
-    value,
+    valueType,
     optionText,
+    value,
+    filterValue,
     onFilterValueChange
   ]);
   return /* @__PURE__ */ React__default.default.createElement(
@@ -1042,15 +1061,6 @@ function BaseComboBox(props) {
       PlasmicListBoxContext.Provider,
       {
         value: {
-          makeItemProps: (item) => ({
-            key: item.value,
-            textValue: optionText(item),
-            children: optionText(item)
-          }),
-          makeSectionProps: (section) => ({
-            section,
-            key: section.key
-          }),
           getItemType: (option) => option.type === "section" ? "section" : "item"
         }
       },
@@ -1181,11 +1191,85 @@ var __objRest$a = (source, exclude) => {
     }
   return target;
 };
+function BaseDialogTrigger(props) {
+  const _a = props, { trigger, dialog } = _a, rest = __objRest$a(_a, ["trigger", "dialog"]);
+  return /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.DialogTrigger, __spreadValues$e({}, rest), trigger, dialog);
+}
+function registerDialogTrigger(loader, overrides) {
+  registerComponentHelper(
+    loader,
+    BaseDialogTrigger,
+    {
+      name: makeComponentName("dialogTrigger"),
+      displayName: "Aria Dialog Trigger",
+      importPath: "@plasmicpkgs/react-aria/skinny/registerDialogTrigger",
+      importName: "BaseDialogTrigger",
+      isAttachment: true,
+      props: {
+        trigger: {
+          type: "slot"
+        },
+        dialog: {
+          type: "slot"
+        },
+        isOpen: {
+          type: "boolean",
+          defaultValueHint: false,
+          editOnly: true,
+          uncontrolledProp: "defaultOpen"
+        },
+        onOpenChange: {
+          type: "eventHandler",
+          argTypes: [{ name: "isOpen", type: "boolean" }]
+        }
+      },
+      states: {
+        isOpen: {
+          type: "writable",
+          valueProp: "isOpen",
+          onChangeProp: "onOpenChange",
+          variableType: "boolean"
+        }
+      },
+      trapsFocus: true
+    },
+    overrides
+  );
+}
+
+var __defProp$d = Object.defineProperty;
+var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
+var __hasOwnProp$d = Object.prototype.hasOwnProperty;
+var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$d = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$d.call(b, prop))
+      __defNormalProp$d(a, prop, b[prop]);
+  if (__getOwnPropSymbols$d)
+    for (var prop of __getOwnPropSymbols$d(b)) {
+      if (__propIsEnum$d.call(b, prop))
+        __defNormalProp$d(a, prop, b[prop]);
+    }
+  return a;
+};
+var __objRest$9 = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp$d.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols$d)
+    for (var prop of __getOwnPropSymbols$d(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$d.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 function BaseForm(props) {
-  const _a = props, { onSubmit, children } = _a, rest = __objRest$a(_a, ["onSubmit", "children"]);
+  const _a = props, { onSubmit, children } = _a, rest = __objRest$9(_a, ["onSubmit", "children"]);
   return /* @__PURE__ */ React__default.default.createElement(
     reactAriaComponents.Form,
-    __spreadValues$e({
+    __spreadValues$d({
       onSubmit: (e) => {
         e.preventDefault();
         const formData = new FormData(e.currentTarget);
@@ -1235,30 +1319,30 @@ function registerForm(loader, overrides) {
   );
 }
 
-var __defProp$d = Object.defineProperty;
-var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
-var __hasOwnProp$d = Object.prototype.hasOwnProperty;
-var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$d = (a, b) => {
+var __defProp$c = Object.defineProperty;
+var __getOwnPropSymbols$c = Object.getOwnPropertySymbols;
+var __hasOwnProp$c = Object.prototype.hasOwnProperty;
+var __propIsEnum$c = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$c = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$d.call(b, prop))
-      __defNormalProp$d(a, prop, b[prop]);
-  if (__getOwnPropSymbols$d)
-    for (var prop of __getOwnPropSymbols$d(b)) {
-      if (__propIsEnum$d.call(b, prop))
-        __defNormalProp$d(a, prop, b[prop]);
+    if (__hasOwnProp$c.call(b, prop))
+      __defNormalProp$c(a, prop, b[prop]);
+  if (__getOwnPropSymbols$c)
+    for (var prop of __getOwnPropSymbols$c(b)) {
+      if (__propIsEnum$c.call(b, prop))
+        __defNormalProp$c(a, prop, b[prop]);
     }
   return a;
 };
-var __objRest$9 = (source, exclude) => {
+var __objRest$8 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$d.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$c.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$d)
-    for (var prop of __getOwnPropSymbols$d(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$d.call(source, prop))
+  if (source != null && __getOwnPropSymbols$c)
+    for (var prop of __getOwnPropSymbols$c(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$c.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -1268,10 +1352,10 @@ const { interactionVariants: interactionVariants$3 } = pickAriaComponentVariants
   INPUT_INTERACTION_VARIANTS
 );
 function BaseInput(props) {
-  const _a = props, { updateInteractionVariant } = _a, rest = __objRest$9(_a, ["updateInteractionVariant"]);
+  const _a = props, { updateInteractionVariant } = _a, rest = __objRest$8(_a, ["updateInteractionVariant"]);
   return /* @__PURE__ */ React__default.default.createElement(
     reactAriaComponents.Input,
-    __spreadValues$d({
+    __spreadValues$c({
       onHoverChange: (isHovered) => {
         updateInteractionVariant == null ? void 0 : updateInteractionVariant({
           hovered: isHovered
@@ -1311,27 +1395,26 @@ function registerInput(loader, overrides) {
   );
 }
 
-var __defProp$c = Object.defineProperty;
-var __getOwnPropSymbols$c = Object.getOwnPropertySymbols;
-var __hasOwnProp$c = Object.prototype.hasOwnProperty;
-var __propIsEnum$c = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$c = (a, b) => {
+var __defProp$b = Object.defineProperty;
+var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
+var __hasOwnProp$b = Object.prototype.hasOwnProperty;
+var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$b = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$c.call(b, prop))
-      __defNormalProp$c(a, prop, b[prop]);
-  if (__getOwnPropSymbols$c)
-    for (var prop of __getOwnPropSymbols$c(b)) {
-      if (__propIsEnum$c.call(b, prop))
-        __defNormalProp$c(a, prop, b[prop]);
+    if (__hasOwnProp$b.call(b, prop))
+      __defNormalProp$b(a, prop, b[prop]);
+  if (__getOwnPropSymbols$b)
+    for (var prop of __getOwnPropSymbols$b(b)) {
+      if (__propIsEnum$b.call(b, prop))
+        __defNormalProp$b(a, prop, b[prop]);
     }
   return a;
 };
 function BaseListBoxItem(props) {
-  var _a;
   const contextProps = React__default.default.useContext(PlasmicItemContext);
   const mergedProps = utils.mergeProps(contextProps, props);
-  return /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.ListBoxItem, __spreadValues$c({ id: (_a = mergedProps.key) != null ? _a : void 0 }, mergedProps));
+  return /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.ListBoxItem, __spreadValues$b({}, mergedProps), mergedProps.children);
 }
 function registerListBoxItem(loader, overrides) {
   registerComponentHelper(
@@ -1343,23 +1426,8 @@ function registerListBoxItem(loader, overrides) {
       importPath: "@plasmicpkgs/react-aria/skinny/registerListBoxItem",
       importName: "BaseListBoxItem",
       props: {
-        className: {
-          type: "class",
-          displayName: "Additional states",
-          selectors: [
-            {
-              selector: ":self[data-selected]",
-              label: "Selected"
-            },
-            {
-              selector: ":self[data-focused], :self[data-hovered]",
-              label: "Focused"
-            },
-            {
-              selector: ":self[data-disabled]",
-              label: "Disabled"
-            }
-          ]
+        children: {
+          type: "slot"
         }
       }
     },
@@ -1367,102 +1435,67 @@ function registerListBoxItem(loader, overrides) {
   );
 }
 
-var __defProp$b = Object.defineProperty;
-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;
-var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$b = (a, b) => {
+var __defProp$a = Object.defineProperty;
+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;
+var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$a = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$b.call(b, prop))
-      __defNormalProp$b(a, prop, b[prop]);
-  if (__getOwnPropSymbols$b)
-    for (var prop of __getOwnPropSymbols$b(b)) {
-      if (__propIsEnum$b.call(b, prop))
-        __defNormalProp$b(a, prop, b[prop]);
+    if (__hasOwnProp$a.call(b, prop))
+      __defNormalProp$a(a, prop, b[prop]);
+  if (__getOwnPropSymbols$a)
+    for (var prop of __getOwnPropSymbols$a(b)) {
+      if (__propIsEnum$a.call(b, prop))
+        __defNormalProp$a(a, prop, b[prop]);
     }
   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$7 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$b.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$a.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$b)
-    for (var prop of __getOwnPropSymbols$b(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$b.call(source, prop))
+  if (source != null && __getOwnPropSymbols$a)
+    for (var prop of __getOwnPropSymbols$a(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$a.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
-const STANDALONE_PROPS = {
-  getItemType: (item) => item.type,
-  items: [
-    { type: "item", value: "op1", label: "Option 1" },
-    { type: "item", value: "op2", label: "Option 2" },
-    { type: "item", value: "op3", label: "Option 3" },
-    {
-      type: "section",
-      label: "Section 1",
-      items: [
-        { type: "item", value: "s1op1", label: "Section 1 Option 1" },
-        { type: "item", value: "s1op2", label: "Section 1 Option 2" },
-        { type: "item", value: "s1op3", label: "Section 1 Option 3" }
-      ]
-    },
-    {
-      type: "section",
-      label: "Section 2",
-      items: [
-        { type: "item", value: "s2op1", label: "Section 2 Option 1" },
-        { type: "item", value: "s2op2", label: "Section 2 Option 2" },
-        { type: "item", value: "s2op3", label: "Section 2 Option 3" }
-      ]
-    }
-  ],
-  makeItemProps: (item) => ({
-    key: item.value,
-    textValue: item.label,
-    children: item.label
-  }),
-  makeSectionProps: (section) => ({
-    section,
-    key: section.label
-  })
-};
 function BaseListBox(props) {
+  var _c;
   const contextProps = React__default.default.useContext(PlasmicListBoxContext);
   const isStandalone = !contextProps;
-  const _a = utils.mergeProps(contextProps, props, isStandalone ? STANDALONE_PROPS : {}), {
-    makeItemProps,
-    makeSectionProps,
-    renderItem,
-    renderSection,
-    getItemType
-  } = _a, rest = __objRest$8(_a, [
-    "makeItemProps",
-    "makeSectionProps",
-    "renderItem",
-    "renderSection",
-    "getItemType"
-  ]);
-  return /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.ListBox, __spreadValues$b({}, utils.mergeProps(contextProps, rest)), (item) => {
-    if ((getItemType == null ? void 0 : getItemType(item)) === "section") {
-      const sectionProps = makeSectionProps == null ? void 0 : makeSectionProps(item);
-      return /* @__PURE__ */ React__default.default.createElement(
+  const _a = props, rest = __objRest$7(_a, ["options"]);
+  const { options } = useStrictOptions(props);
+  const _b = utils.mergeProps(
+    contextProps,
+    rest,
+    isStandalone ? { items: options } : {}
+  ), { renderItem, renderSection } = _b, mergedProps = __objRest$7(_b, ["renderItem", "renderSection"]);
+  (_c = props.setControlContextData) == null ? void 0 : _c.call(props, {
+    isStandalone
+  });
+  return /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.ListBox, __spreadValues$a({}, mergedProps), (item) => {
+    var _a2;
+    if (item.type === "option-group") {
+      return /* @__PURE__ */ React__default.default.createElement(React__default.default.Fragment, null, /* @__PURE__ */ React__default.default.createElement(
         PlasmicSectionContext.Provider,
         {
-          key: sectionProps == null ? void 0 : sectionProps.key,
-          value: __spreadProps$7(__spreadValues$b({}, sectionProps), { makeItemProps, renderItem })
+          value: {
+            renderItem,
+            key: (_a2 = item.key) != null ? _a2 : item.label,
+            section: item
+          }
         },
         renderSection == null ? void 0 : renderSection(item)
-      );
+      ));
     } else {
-      const itemProps = makeItemProps == null ? void 0 : makeItemProps(item);
-      return /* @__PURE__ */ React__default.default.createElement(PlasmicItemContext.Provider, { key: itemProps == null ? void 0 : itemProps.key, value: itemProps }, renderItem == null ? void 0 : renderItem(item));
+      return /* @__PURE__ */ React__default.default.createElement(PlasmicItemContext.Provider, { value: item }, renderItem == null ? void 0 : renderItem(item));
     }
   });
 }
@@ -1476,29 +1509,19 @@ function registerListBox(loader, overrides) {
       importPath: "@plasmicpkgs/react-aria/skinny/registerListBox",
       importName: "BaseListBox",
       props: {
+        options: __spreadProps$6(__spreadValues$a({}, makeOptionsPropType()), {
+          displayName: "Items",
+          hidden: (_ps, ctx) => !(ctx == null ? void 0 : ctx.isStandalone)
+        }),
         renderItem: {
           type: "slot",
           displayName: "Render Item",
-          renderPropParams: ["item"]
+          renderPropParams: ["itemProps"]
         },
         renderSection: {
           type: "slot",
           displayName: "Render Section",
-          renderPropParams: ["section"]
-        },
-        className: {
-          type: "class",
-          displayName: "Additional states",
-          selectors: [
-            {
-              selector: ":self[data-focused]",
-              label: "Focused"
-            },
-            {
-              selector: ":self[data-focus-visible]",
-              label: "Focused by keyboard"
-            }
-          ]
+          renderPropParams: ["sectionProps"]
         }
       }
     },
@@ -1509,33 +1532,33 @@ function registerListBox(loader, overrides) {
   });
 }
 
-var __defProp$a = Object.defineProperty;
-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;
-var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$a = (a, b) => {
+var __defProp$9 = Object.defineProperty;
+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;
+var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$9 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$a.call(b, prop))
-      __defNormalProp$a(a, prop, b[prop]);
-  if (__getOwnPropSymbols$a)
-    for (var prop of __getOwnPropSymbols$a(b)) {
-      if (__propIsEnum$a.call(b, prop))
-        __defNormalProp$a(a, prop, b[prop]);
+    if (__hasOwnProp$9.call(b, prop))
+      __defNormalProp$9(a, prop, b[prop]);
+  if (__getOwnPropSymbols$9)
+    for (var prop of __getOwnPropSymbols$9(b)) {
+      if (__propIsEnum$9.call(b, prop))
+        __defNormalProp$9(a, prop, b[prop]);
     }
   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$6 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$a.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$9.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$a)
-    for (var prop of __getOwnPropSymbols$a(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$a.call(source, prop))
+  if (source != null && __getOwnPropSymbols$9)
+    for (var prop of __getOwnPropSymbols$9(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$9.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -1548,7 +1571,7 @@ const BaseModal = React.forwardRef(
       modalOverlayClass,
       onOpenChange,
       className
-    } = _a, rest = __objRest$7(_a, [
+    } = _a, rest = __objRest$6(_a, [
       "children",
       "heading",
       "modalOverlayClass",
@@ -1567,7 +1590,7 @@ const BaseModal = React.forwardRef(
     const body = /* @__PURE__ */ React__default.default.createElement(React__default.default.Fragment, null, heading && /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.Heading, { slot: "title" }, heading), children);
     return /* @__PURE__ */ React__default.default.createElement(
       reactAriaComponents.ModalOverlay,
-      __spreadProps$6(__spreadValues$a({}, rest), {
+      __spreadProps$5(__spreadValues$9({}, rest), {
         className: modalOverlayClass,
         onOpenChange
       }),
@@ -1639,58 +1662,48 @@ function registerModal(loader, overrides) {
   );
 }
 
-var __defProp$9 = Object.defineProperty;
-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;
-var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$9 = (a, b) => {
+var __defProp$8 = Object.defineProperty;
+var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
+var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
+var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$8 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$9.call(b, prop))
-      __defNormalProp$9(a, prop, b[prop]);
-  if (__getOwnPropSymbols$9)
-    for (var prop of __getOwnPropSymbols$9(b)) {
-      if (__propIsEnum$9.call(b, prop))
-        __defNormalProp$9(a, prop, b[prop]);
+    if (__hasOwnProp$8.call(b, prop))
+      __defNormalProp$8(a, prop, b[prop]);
+  if (__getOwnPropSymbols$8)
+    for (var prop of __getOwnPropSymbols$8(b)) {
+      if (__propIsEnum$8.call(b, prop))
+        __defNormalProp$8(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
-var __objRest$6 = (source, exclude) => {
+var __objRest$5 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$9.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$8.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$9)
-    for (var prop of __getOwnPropSymbols$9(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$9.call(source, prop))
+  if (source != null && __getOwnPropSymbols$8)
+    for (var prop of __getOwnPropSymbols$8(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$8.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
 function BasePopover(props) {
-  const _a = props, { resetClassName } = _a, restProps = __objRest$6(_a, ["resetClassName"]);
+  const _a = props, { resetClassName } = _a, restProps = __objRest$5(_a, ["resetClassName"]);
   const isStandalone = !React__default.default.useContext(reactAriaComponents.PopoverContext);
   const contextProps = React__default.default.useContext(PlasmicPopoverContext);
-  const canvas = host.usePlasmicCanvasContext();
   const mergedProps = utils.mergeProps(contextProps, restProps, {
     className: `${resetClassName}`
   });
-  if (isStandalone) {
-    const triggerRef = React__default.default.useRef(null);
-    return /* @__PURE__ */ React__default.default.createElement(React__default.default.Fragment, null, /* @__PURE__ */ React__default.default.createElement("div", { ref: triggerRef }), /* @__PURE__ */ React__default.default.createElement(
-      reactAriaComponents.Popover,
-      __spreadProps$5(__spreadValues$9({}, mergedProps), {
-        triggerRef,
-        isNonModal: true,
-        isOpen: true
-      })
-    ));
-  } else {
-    return /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.Popover, __spreadProps$5(__spreadValues$9({}, mergedProps), { isNonModal: !!canvas }));
-  }
+  const triggerRef = React__default.default.useRef(null);
+  const standaloneProps = isStandalone ? {
+    triggerRef,
+    isNonModal: true,
+    isOpen: true
+  } : {};
+  return /* @__PURE__ */ React__default.default.createElement(React__default.default.Fragment, null, isStandalone && /* @__PURE__ */ React__default.default.createElement("div", { ref: triggerRef }), /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.Popover, __spreadValues$8(__spreadValues$8({}, mergedProps), standaloneProps)));
 }
 function registerPopover(loader, overrides) {
   registerComponentHelper(
@@ -1726,20 +1739,6 @@ function registerPopover(loader, overrides) {
         resetClassName: {
           type: "themeResetClass"
         }
-        // className: {
-        //   type: "class",
-        //   displayName: "Additional states",
-        //   selectors: [
-        //     {
-        //       selector: ":self[data-entering]",
-        //       label: "Entering",
-        //     },
-        //     {
-        //       selector: ":self[data-exiting]",
-        //       label: "Exiting",
-        //     },
-        //   ],
-        // },
       },
       styleSections: true
     },
@@ -1763,33 +1762,33 @@ class ErrorBoundary extends React.Component {
   }
 }
 
-var __defProp$8 = Object.defineProperty;
+var __defProp$7 = Object.defineProperty;
 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;
-var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$8 = (a, b) => {
+var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
+var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
+var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$7 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$8.call(b, prop))
-      __defNormalProp$8(a, prop, b[prop]);
-  if (__getOwnPropSymbols$8)
-    for (var prop of __getOwnPropSymbols$8(b)) {
-      if (__propIsEnum$8.call(b, prop))
-        __defNormalProp$8(a, prop, b[prop]);
+    if (__hasOwnProp$7.call(b, prop))
+      __defNormalProp$7(a, prop, b[prop]);
+  if (__getOwnPropSymbols$7)
+    for (var prop of __getOwnPropSymbols$7(b)) {
+      if (__propIsEnum$7.call(b, prop))
+        __defNormalProp$7(a, prop, b[prop]);
     }
   return a;
 };
 var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
-var __objRest$5 = (source, exclude) => {
+var __objRest$4 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$8.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$7.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$8)
-    for (var prop of __getOwnPropSymbols$8(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$8.call(source, prop))
+  if (source != null && __getOwnPropSymbols$7)
+    for (var prop of __getOwnPropSymbols$7(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$7.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -1804,8 +1803,8 @@ const { interactionVariants: interactionVariants$2, withObservedValues: withObse
   RADIO_INTERACTION_VARIANTS
 );
 function BaseRadio(props) {
-  const _a = props, { children, updateInteractionVariant } = _a, rest = __objRest$5(_a, ["children", "updateInteractionVariant"]);
-  const radio = /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.Radio, __spreadValues$8({}, rest), ({ isHovered, isPressed, isFocused, isFocusVisible }) => withObservedValues$1(
+  const _a = props, { children, updateInteractionVariant } = _a, rest = __objRest$4(_a, ["children", "updateInteractionVariant"]);
+  const radio = /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.Radio, __spreadValues$7({}, rest), ({ isHovered, isPressed, isFocused, isFocusVisible }) => withObservedValues$1(
     children,
     {
       hovered: isHovered,
@@ -1827,7 +1826,7 @@ function registerRadio(loader, overrides) {
       importPath: "@plasmicpkgs/react-aria/skinny/registerRadio",
       importName: "BaseRadio",
       interactionVariants: interactionVariants$2,
-      props: __spreadProps$4(__spreadValues$8({}, getCommonInputProps("radio", [
+      props: __spreadProps$4(__spreadValues$7({}, getCommonInputProps("radio", [
         "isDisabled",
         "autoFocus",
         "aria-label",
@@ -1855,21 +1854,21 @@ function registerRadio(loader, overrides) {
   );
 }
 
-var __defProp$7 = Object.defineProperty;
+var __defProp$6 = Object.defineProperty;
 var __defProps$3 = Object.defineProperties;
 var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
-var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
-var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$7 = (a, b) => {
+var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
+var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
+var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$6 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$7.call(b, prop))
-      __defNormalProp$7(a, prop, b[prop]);
-  if (__getOwnPropSymbols$7)
-    for (var prop of __getOwnPropSymbols$7(b)) {
-      if (__propIsEnum$7.call(b, prop))
-        __defNormalProp$7(a, prop, b[prop]);
+    if (__hasOwnProp$6.call(b, prop))
+      __defNormalProp$6(a, prop, b[prop]);
+  if (__getOwnPropSymbols$6)
+    for (var prop of __getOwnPropSymbols$6(b)) {
+      if (__propIsEnum$6.call(b, prop))
+        __defNormalProp$6(a, prop, b[prop]);
     }
   return a;
 };
@@ -1885,7 +1884,7 @@ function registerRadioGroup(loader, overrides) {
       displayName: "Aria RadioGroup",
       importPath: "@plasmicpkgs/react-aria/skinny/registerRadioGroup",
       importName: "BaseRadioGroup",
-      props: __spreadProps$3(__spreadValues$7({}, getCommonInputProps("radio group", [
+      props: __spreadProps$3(__spreadValues$6({}, getCommonInputProps("radio group", [
         "name",
         "isDisabled",
         "isReadOnly",
@@ -1940,25 +1939,25 @@ function registerRadioGroup(loader, overrides) {
   });
 }
 
-var __defProp$6 = Object.defineProperty;
-var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
-var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
-var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$6 = (a, b) => {
+var __defProp$5 = Object.defineProperty;
+var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
+var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
+var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$5 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$6.call(b, prop))
-      __defNormalProp$6(a, prop, b[prop]);
-  if (__getOwnPropSymbols$6)
-    for (var prop of __getOwnPropSymbols$6(b)) {
-      if (__propIsEnum$6.call(b, prop))
-        __defNormalProp$6(a, prop, b[prop]);
+    if (__hasOwnProp$5.call(b, prop))
+      __defNormalProp$5(a, prop, b[prop]);
+  if (__getOwnPropSymbols$5)
+    for (var prop of __getOwnPropSymbols$5(b)) {
+      if (__propIsEnum$5.call(b, prop))
+        __defNormalProp$5(a, prop, b[prop]);
     }
   return a;
 };
 function BaseHeader(props) {
   const contextProps = React__default.default.useContext(PlasmicHeaderContext);
-  return /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.Header, __spreadValues$6({}, utils.mergeProps(contextProps, props)));
+  return /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.Header, __spreadValues$5({}, utils.mergeProps(contextProps, props)));
 }
 function registerHeader(loader, overrides) {
   registerComponentHelper(
@@ -1975,41 +1974,12 @@ function registerHeader(loader, overrides) {
   );
 }
 
-var __defProp$5 = Object.defineProperty;
-var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$5 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$5.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(b)) {
-      if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest$4 = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp$5.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$5.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 function BaseSection(props) {
   const contextProps = React__default.default.useContext(PlasmicSectionContext);
   const mergedProps = utils.mergeProps(contextProps, props);
-  const _a = mergedProps, { section, renderHeader, key, makeItemProps, renderItem } = _a, rest = __objRest$4(_a, ["section", "renderHeader", "key", "makeItemProps", "renderItem"]);
-  return /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.Section, __spreadValues$5({ id: key != null ? key : void 0 }, rest), /* @__PURE__ */ React__default.default.createElement(PlasmicHeaderContext.Provider, { value: { children: section == null ? void 0 : section.label } }, renderHeader == null ? void 0 : renderHeader(section)), /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.Collection, { items: section == null ? void 0 : section.items }, (item) => {
-    const itemProps = makeItemProps == null ? void 0 : makeItemProps(item);
-    return /* @__PURE__ */ React__default.default.createElement(PlasmicItemContext.Provider, { key: itemProps == null ? void 0 : itemProps.key, value: itemProps }, renderItem == null ? void 0 : renderItem(item));
+  const { section, renderHeader, key, renderItem } = mergedProps;
+  return /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.Section, { id: key }, /* @__PURE__ */ React__default.default.createElement(PlasmicHeaderContext.Provider, { value: { children: section == null ? void 0 : section.label } }, renderHeader == null ? void 0 : renderHeader(section)), /* @__PURE__ */ React__default.default.createElement(reactAriaComponents.Collection, { items: section == null ? void 0 : section.items }, (item) => {
+    return /* @__PURE__ */ React__default.default.createElement(PlasmicItemContext.Provider, { value: item }, renderItem == null ? void 0 : renderItem(item));
   }));
 }
 function registerSection(loader, overrides) {
@@ -2025,7 +1995,7 @@ function registerSection(loader, overrides) {
         renderHeader: {
           type: "slot",
           displayName: "Render section header",
-          renderPropParams: ["section"]
+          renderPropParams: ["sectionProps"]
         }
       }
     },
@@ -2068,13 +2038,12 @@ function BaseSelect(props) {
     className,
     style,
     structure,
-    renderOption,
     name,
     "aria-label": ariaLabel
   } = props;
-  const { options, optionText } = useStrictOptions(props);
+  const { options } = useStrictOptions(props);
   const canvas = host.usePlasmicCanvasContext();
-  const disabledKeys = flattenOptions(options).filter((op) => op.isDisabled).map((op) => op.value);
+  const disabledKeys = flattenOptions(options).filter((op) => op.isDisabled).map((op) => op.id);
   return /* @__PURE__ */ React__default.default.createElement(
     reactAriaComponents.Select,
     __spreadValues$4(__spreadValues$4({
@@ -2093,17 +2062,7 @@ function BaseSelect(props) {
       {
         value: {
           items: options,
-          disabledKeys,
-          makeItemProps: (item) => ({
-            key: item.value,
-            textValue: optionText(item),
-            children: renderOption ? renderOption(item) : optionText(item)
-          }),
-          makeSectionProps: (section) => ({
-            section,
-            key: section.key
-          }),
-          getItemType: (option) => option.type === "section" ? "section" : "item"
+          disabledKeys
         }
       },
       structure
@@ -2748,12 +2707,19 @@ function BaseTooltip(props) {
     ref
   );
   const focusableChild = flattenChildren__default.default(children)[0];
-  return /* @__PURE__ */ React__default.default.createElement(React__default.default.Fragment, null, React__default.default.isValidElement(focusableChild) ? React__default.default.cloneElement(focusableChild, __spreadValues({
-    ref
-  }, utils.mergeProps(
-    focusableChild.props,
-    triggerProps
-  ))) : null, state.isOpen && /* @__PURE__ */ React__default.default.createElement("span", __spreadProps(__spreadValues({}, tooltipProps), { className: `${className} ${resetClassName}` }), tooltipContent));
+  return /* @__PURE__ */ React__default.default.createElement(
+    "div",
+    {
+      style: { position: "relative" }
+    },
+    React__default.default.isValidElement(focusableChild) ? React__default.default.cloneElement(focusableChild, __spreadValues({
+      ref
+    }, utils.mergeProps(
+      focusableChild.props,
+      triggerProps
+    ))) : null,
+    state.isOpen && /* @__PURE__ */ React__default.default.createElement("span", __spreadProps(__spreadValues({}, tooltipProps), { className: `${className} ${resetClassName}` }), tooltipContent)
+  );
 }
 function registerTooltip(loader, overrides) {
   registerComponentHelper(
@@ -2846,6 +2812,7 @@ function registerAll(loader) {
   registerTextField(loader);
   registerModal(loader);
   registerTooltip(loader);
+  registerDialogTrigger(loader);
 }
 
 exports.registerAll = registerAll;