@multiplatform.one/components 0.7.4 → 0.7.9

package/dist/esm/panels/SimplePopover/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/panels/SimplePopover/index.tsx"],
-  "mappings": "AA8BA,SAAS,OAAO,SAAS,cAAc,MAAM,UAAU,iBAAiB,yBAAyB;AACjG,OAAO,WAAW;AAElB,SAAS,cAAc;AA0BnB,cA6CI,YA7CJ;AALG,MAAM,uBAAuB,MAAM,WAAuC,CAAC,OAAmB,iBAAiB;AACpH,QAAM,UAAU,kBAAkB,GAC5B,qBAAqB,gBAAgB,cAAc,QAAQ,UAAU,GAErE,UACJ;AAAA,IAAC;AAAA;AAAA,MACC,iBAAc;AAAA,MACd,iBAAe,QAAQ;AAAA,MACvB,cAAY,SAAS,QAAQ,IAAI;AAAA,MAChC,GAAG;AAAA,MACJ,KAAK;AAAA;AAAA,EACP;AAGF,SAAO,QAAQ,kBAAkB,UAAU,oBAAC,gBAAa,SAAO,IAAE,mBAAQ;AAC5E,CAAC;AAEM,SAAS,cAAc;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAAuB;AACrB,QAAM,CAAC,MAAM,OAAO,IAAI,MAAM,SAAS,EAAK,GACtC,UAAU,aAAa;AAE7B,SACE,qBAAC,WAAQ,MAAK,MAAK,WAAS,IAAC,MAAY,cAAc,SAAU,GAAG,OACjE;AAAA,eACC,MAAM,WAEJ,oBAAC,QAAQ,SAAR,EAAgB,SAAO,IACrB,2BACC,oBAAC,UAAO,WAAW,MAAM,QAAQ,EAAI,GAAG,YAAY,MAAM,QAAQ,EAAK,GAAI,GAAG,cAC3E,gBAAM,SACT,IAEA,MAAM,SAEV;AAAA,IAEH,CAAC,WAAW,oBAAoB,SAAS,UAAU,SAClD,oBAAC,wBAAqB,SAAO,IAAE,gBAAM,gBAAe;AAAA,IAGtD,oBAAC,SAAM,MAAK,MAAK,UAAS,SACxB,+BAAC,QAAQ,OAAR,EAAc,OAAK,IAAC,uBAAqB,IACxC;AAAA,0BAAC,QAAQ,MAAM,OAAd,EAAoB,SAAQ,MAAK,cAAc,MAAM,QAAQ,EAAI,GAChE,8BAAC,MAAM,UAAN,EAAe,GAClB;AAAA,MACA,oBAAC,QAAQ,MAAM,SAAd,EAAsB;AAAA,OACzB,GACF;AAAA,IACA;AAAA,MAAC,QAAQ;AAAA,MAAR;AAAA,QACC,aAAa;AAAA,QACb,aAAY;AAAA,QACZ,YAAY,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,QACvC,WAAY,iBAAgD,SAA/B,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,QACxD,GAAG;AAAA,QACH,GAAG;AAAA,QACH,SAAS;AAAA,QACT,WACG,iBASG,SARA;AAAA,UACE;AAAA,UACA;AAAA,YACE,SAAS;AAAA,cACP,mBAAmB;AAAA,YACrB;AAAA,UACF;AAAA,QACF;AAAA,QAGN,SAAO;AAAA,QACP,WAAW,iBAAiB,MAAM,QAAQ,EAAI,IAAI;AAAA,QAClD,YAAY,kBAAkB,kBAAkB,MAAM,QAAQ,EAAK,IAAI;AAAA,QACvE,IAAI;AAAA,QACH,GAAG;AAAA,QAEH;AAAA,mBAAS,oBAAC,QAAQ,OAAR,EAAc,aAAa,GAAG,aAAY,gBAAgB,GAAG,YAAY;AAAA,UACnF;AAAA;AAAA;AAAA,IACH;AAAA,KACF;AAEJ;",
+  "mappings": "AAsBA,SAAS,OAAO,eAAe;AAC/B,OAAO,WAAW;AA4CZ,cAIE,YAJF;AA7BC,SAAS,cAAc;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAAuB;AACrB,QAAM,CAAC,MAAM,OAAO,IAAI,MAAM,SAAS,EAAK;AAE5C,WAAS,cAAc,GAAG;AACxB,IAAK,mBACL,QAAQ,EAAI,GACR,cAAc,aAAW,cAAc,UAAU,CAAC,GAClD,cAAc,aAAW,aAAa,UAAU,CAAC;AAAA,EACvD;AAEA,WAAS,eAAe,GAAG;AACzB,IAAK,oBACL,QAAQ,EAAK,GACT,cAAc,cAAY,aAAa,WAAW,CAAC,GACnD,cAAc,cAAY,aAAa,WAAW,CAAC;AAAA,EACzD;AAEA,SACE,qBAAC,WAAQ,MAAK,MAAK,WAAS,IAAC,MAAY,cAAc,SAAU,GAAG,OAClE;AAAA,wBAAC,QAAQ,SAAR,EAAgB,SAAO,IAAE,GAAG,cAAc,WAAW,eAAe,YAAY,gBAC9E,mBACH;AAAA,IACA,oBAAC,SAAM,MAAK,MAAK,UAAS,SACxB,+BAAC,QAAQ,OAAR,EAAc,OAAK,IAAC,uBAAqB,IACxC;AAAA,0BAAC,QAAQ,MAAM,OAAd,EAAoB,SAAQ,MAAK,cAAc,MAAM,QAAQ,EAAI,GAChE,8BAAC,MAAM,UAAN,EAAe,GAClB;AAAA,MACA,oBAAC,QAAQ,MAAM,SAAd,EAAsB;AAAA,OACzB,GACF;AAAA,IACA;AAAA,MAAC,QAAQ;AAAA,MAAR;AAAA,QACC,aAAa;AAAA,QACb,aAAY;AAAA,QACZ,YAAY,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,QACvC,WAAY,iBAAgD,SAA/B,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,QACxD,GAAG;AAAA,QACH,GAAG;AAAA,QACH,SAAS;AAAA,QACT,WACG,iBASG,SARA;AAAA,UACE;AAAA,UACA;AAAA,YACE,SAAS;AAAA,cACP,mBAAmB;AAAA,YACrB;AAAA,UACF;AAAA,QACF;AAAA,QAGN,SAAO;AAAA,QACP,IAAI;AAAA,QACH,GAAG;AAAA,QACJ,WAAW;AAAA,QACX,YAAY;AAAA,QAEX;AAAA,mBAAS,oBAAC,QAAQ,OAAR,EAAc,aAAa,GAAG,aAAY,gBAAgB,GAAG,YAAY;AAAA,UACnF;AAAA;AAAA;AAAA,IACH;AAAA,KACF;AAEJ;",
   "names": []
 }

package/dist/esm/panels/SimplePopover/index.native.js

@@ -1,19 +1,5 @@
-import { Adapt, Popover, PopperAnchor, View, getState, useComposedRefs, usePopoverContext } from "tamagui";
+import { Adapt, Popover } from "tamagui";
 import React from "react";
-import { YStack } from "tamagui";
-const SimplePopoverTrigger = React.forwardRef((props, forwardedRef) => {
-  const context = usePopoverContext(), composedTriggerRef = useComposedRefs(forwardedRef, context.triggerRef), trigger = /* @__PURE__ */ React.createElement(
-    View,
-    {
-      "aria-haspopup": "dialog",
-      "aria-expanded": context.open,
-      "data-state": getState(context.open),
-      ...props,
-      ref: composedTriggerRef
-    }
-  );
-  return context.hasCustomAnchor ? trigger : /* @__PURE__ */ React.createElement(PopperAnchor, { asChild: !0 }, trigger);
-});
 function SimplePopover({
   children,
   contentStyle,
@@ -22,10 +8,17 @@ function SimplePopover({
   arrow = !0,
   triggerOnHover,
   closeOnHoverOut,
+  trigger,
   ...props
 }) {
-  const [open, setOpen] = React.useState(!1), trigger = "trigger" in props;
-  return /* @__PURE__ */ React.createElement(Popover, { size: "$5", allowFlip: !0, open, onOpenChange: setOpen, ...props }, trigger && props.trigger && /* @__PURE__ */ React.createElement(Popover.Trigger, { asChild: !0 }, triggerOnHover ? /* @__PURE__ */ React.createElement(YStack, { onHoverIn: () => setOpen(!0), onHoverOut: () => setOpen(!1), ...triggerStyle }, props.trigger) : props.trigger), !trigger && "triggerElement" in props && "open" in props && /* @__PURE__ */ React.createElement(SimplePopoverTrigger, { asChild: !0 }, props.triggerElement), /* @__PURE__ */ React.createElement(Adapt, { when: "sm", platform: "touch" }, /* @__PURE__ */ React.createElement(Popover.Sheet, { modal: !0, dismissOnSnapToBottom: !0 }, /* @__PURE__ */ React.createElement(Popover.Sheet.Frame, { padding: "$4", onMouseEnter: () => setOpen(!0) }, /* @__PURE__ */ React.createElement(Adapt.Contents, null)), /* @__PURE__ */ React.createElement(Popover.Sheet.Overlay, null))), /* @__PURE__ */ React.createElement(
+  const [open, setOpen] = React.useState(!1);
+  function handleHoverIn(e) {
+    triggerOnHover && (setOpen(!0), contentStyle?.onHoverIn && contentStyle?.onHoverIn(e), triggerStyle?.onHoverIn && triggerStyle.onHoverIn(e));
+  }
+  function handleHoverOut(e) {
+    closeOnHoverOut && (setOpen(!1), contentStyle?.onHoverOut && contentStyle.onHoverOut(e), triggerStyle?.onHoverOut && triggerStyle.onHoverOut(e));
+  }
+  return /* @__PURE__ */ React.createElement(Popover, { size: "$5", allowFlip: !0, open, onOpenChange: setOpen, ...props }, /* @__PURE__ */ React.createElement(Popover.Trigger, { asChild: !0, ...triggerStyle, onHoverIn: handleHoverIn, onHoverOut: handleHoverOut }, trigger), /* @__PURE__ */ React.createElement(Adapt, { when: "sm", platform: "touch" }, /* @__PURE__ */ React.createElement(Popover.Sheet, { modal: !0, dismissOnSnapToBottom: !0 }, /* @__PURE__ */ React.createElement(Popover.Sheet.Frame, { padding: "$4", onMouseEnter: () => setOpen(!0) }, /* @__PURE__ */ React.createElement(Adapt.Contents, null)), /* @__PURE__ */ React.createElement(Popover.Sheet.Overlay, null))), /* @__PURE__ */ React.createElement(
     Popover.Content,
     {
       borderWidth: 1,
@@ -44,17 +37,16 @@ function SimplePopover({
         }
       ],
       elevate: !0,
-      onHoverIn: triggerOnHover ? () => setOpen(!0) : void 0,
-      onHoverOut: triggerOnHover || closeOnHoverOut ? () => setOpen(!1) : void 0,
       zi: 9999999999,
-      ...contentStyle
+      ...contentStyle,
+      onHoverIn: handleHoverIn,
+      onHoverOut: handleHoverOut
     },
     arrow && /* @__PURE__ */ React.createElement(Popover.Arrow, { borderWidth: 1, borderColor: "$borderColor", ...arrowStyle }),
     children
   ));
 }
 export {
-  SimplePopover,
-  SimplePopoverTrigger
+  SimplePopover
 };
 //# sourceMappingURL=index.js.map

package/dist/esm/panels/SimplePopover/index.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/panels/SimplePopover/index.tsx"],
-  "mappings": "AA8BA,SAAS,OAAO,SAAS,cAAc,MAAM,UAAU,iBAAiB,yBAAyB;AACjG,OAAO,WAAW;AAElB,SAAS,cAAc;AAqBhB,MAAM,uBAAuB,MAAM,WAAuC,CAAC,OAAmB,iBAAiB;AACpH,QAAM,UAAU,kBAAkB,GAC5B,qBAAqB,gBAAgB,cAAc,QAAQ,UAAU,GAErE,UACJ;AAAA,IAAC;AAAA;AAAA,MACC,iBAAc;AAAA,MACd,iBAAe,QAAQ;AAAA,MACvB,cAAY,SAAS,QAAQ,IAAI;AAAA,MAChC,GAAG;AAAA,MACJ,KAAK;AAAA;AAAA,EACP;AAGF,SAAO,QAAQ,kBAAkB,UAAU,oCAAC,gBAAa,SAAO,MAAE,OAAQ;AAC5E,CAAC;AAEM,SAAS,cAAc;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAAuB;AACrB,QAAM,CAAC,MAAM,OAAO,IAAI,MAAM,SAAS,EAAK,GACtC,UAAU,aAAa;AAE7B,SACE,oCAAC,WAAQ,MAAK,MAAK,WAAS,IAAC,MAAY,cAAc,SAAU,GAAG,SACjE,WACC,MAAM,WAEJ,oCAAC,QAAQ,SAAR,EAAgB,SAAO,MACrB,iBACC,oCAAC,UAAO,WAAW,MAAM,QAAQ,EAAI,GAAG,YAAY,MAAM,QAAQ,EAAK,GAAI,GAAG,gBAC3E,MAAM,OACT,IAEA,MAAM,OAEV,GAEH,CAAC,WAAW,oBAAoB,SAAS,UAAU,SAClD,oCAAC,wBAAqB,SAAO,MAAE,MAAM,cAAe,GAGtD,oCAAC,SAAM,MAAK,MAAK,UAAS,WACxB,oCAAC,QAAQ,OAAR,EAAc,OAAK,IAAC,uBAAqB,MACxC,oCAAC,QAAQ,MAAM,OAAd,EAAoB,SAAQ,MAAK,cAAc,MAAM,QAAQ,EAAI,KAChE,oCAAC,MAAM,UAAN,IAAe,CAClB,GACA,oCAAC,QAAQ,MAAM,SAAd,IAAsB,CACzB,CACF,GACA;AAAA,IAAC,QAAQ;AAAA,IAAR;AAAA,MACC,aAAa;AAAA,MACb,aAAY;AAAA,MACZ,YAAY,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,MACvC,WAAY,iBAAgD,SAA/B,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,MACxD,GAAG;AAAA,MACH,GAAG;AAAA,MACH,SAAS;AAAA,MACT,WACG,iBASG,SARA;AAAA,QACE;AAAA,QACA;AAAA,UACE,SAAS;AAAA,YACP,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF;AAAA,MAGN,SAAO;AAAA,MACP,WAAW,iBAAiB,MAAM,QAAQ,EAAI,IAAI;AAAA,MAClD,YAAY,kBAAkB,kBAAkB,MAAM,QAAQ,EAAK,IAAI;AAAA,MACvE,IAAI;AAAA,MACH,GAAG;AAAA;AAAA,IAEH,SAAS,oCAAC,QAAQ,OAAR,EAAc,aAAa,GAAG,aAAY,gBAAgB,GAAG,YAAY;AAAA,IACnF;AAAA,EACH,CACF;AAEJ;",
+  "mappings": "AAsBA,SAAS,OAAO,eAAe;AAC/B,OAAO,WAAW;AAeX,SAAS,cAAc;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAAuB;AACrB,QAAM,CAAC,MAAM,OAAO,IAAI,MAAM,SAAS,EAAK;AAE5C,WAAS,cAAc,GAAG;AACxB,IAAK,mBACL,QAAQ,EAAI,GACR,cAAc,aAAW,cAAc,UAAU,CAAC,GAClD,cAAc,aAAW,aAAa,UAAU,CAAC;AAAA,EACvD;AAEA,WAAS,eAAe,GAAG;AACzB,IAAK,oBACL,QAAQ,EAAK,GACT,cAAc,cAAY,aAAa,WAAW,CAAC,GACnD,cAAc,cAAY,aAAa,WAAW,CAAC;AAAA,EACzD;AAEA,SACE,oCAAC,WAAQ,MAAK,MAAK,WAAS,IAAC,MAAY,cAAc,SAAU,GAAG,SAClE,oCAAC,QAAQ,SAAR,EAAgB,SAAO,IAAE,GAAG,cAAc,WAAW,eAAe,YAAY,kBAC9E,OACH,GACA,oCAAC,SAAM,MAAK,MAAK,UAAS,WACxB,oCAAC,QAAQ,OAAR,EAAc,OAAK,IAAC,uBAAqB,MACxC,oCAAC,QAAQ,MAAM,OAAd,EAAoB,SAAQ,MAAK,cAAc,MAAM,QAAQ,EAAI,KAChE,oCAAC,MAAM,UAAN,IAAe,CAClB,GACA,oCAAC,QAAQ,MAAM,SAAd,IAAsB,CACzB,CACF,GACA;AAAA,IAAC,QAAQ;AAAA,IAAR;AAAA,MACC,aAAa;AAAA,MACb,aAAY;AAAA,MACZ,YAAY,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,MACvC,WAAY,iBAAgD,SAA/B,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,MACxD,GAAG;AAAA,MACH,GAAG;AAAA,MACH,SAAS;AAAA,MACT,WACG,iBASG,SARA;AAAA,QACE;AAAA,QACA;AAAA,UACE,SAAS;AAAA,YACP,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF;AAAA,MAGN,SAAO;AAAA,MACP,IAAI;AAAA,MACH,GAAG;AAAA,MACJ,WAAW;AAAA,MACX,YAAY;AAAA;AAAA,IAEX,SAAS,oCAAC,QAAQ,OAAR,EAAc,aAAa,GAAG,aAAY,gBAAgB,GAAG,YAAY;AAAA,IACnF;AAAA,EACH,CACF;AAEJ;",
   "names": []
 }

package/dist/jsx/panels/SimplePopover/SimplePopover.stories.js

@@ -1,18 +1,18 @@
 import { useState } from "react";
 import { SimplePopover } from "./index";
-import { Text, YStack, XStack, Switch, Input, Label } from "tamagui";
+import { Text, YStack, XStack, Switch, Label, Button } from "tamagui";
 const meta = {
   title: "panels/SimplePopover",
   component: SimplePopover,
   parameters: { status: { type: "beta" } }
-}, main = () => <SimplePopover><YStack><Text>popover content</Text></YStack></SimplePopover>, closeOnHoverOut = () => <SimplePopover
-  closeOnHoverOut
-><YStack><Text>popover content will close on hoverOut</Text></YStack></SimplePopover>;
+}, main = () => <SimplePopover trigger={<Button>Click here to get a Popover</Button>}><YStack><Text>popover content</Text></YStack></SimplePopover>, closeOnHoverOut = () => <SimplePopover trigger={<Button>click here</Button>} closeOnHoverOut><YStack><Text>popover content will close on hoverOut</Text></YStack></SimplePopover>;
 function Open() {
   return <SimplePopover
+    trigger={<Button>hover on it to get Popover</Button>}
     triggerOnHover
     arrow={!1}
     triggerStyle={{ als: "center", ai: "center" }}
+    closeOnHoverOut
   ><YStack>{[1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map((i) => <Text key={i}>{i}</Text>)}</YStack></SimplePopover>;
 }
 const openOnHover = () => <XStack jc="space-around">
@@ -23,29 +23,14 @@ const openOnHover = () => <XStack jc="space-around">
   return <YStack space>
     <Label>change the switch to get popover</Label>
     <Switch checked={props.open} onCheckedChange={setOpen} />
-    <SimplePopover
-      open={open}
-      onOpenChange={setOpen}
-    ><Text>Conditional popover</Text></SimplePopover>
+    <SimplePopover open={open} onOpenChange={setOpen} trigger={<Button>Popup will open here</Button>}><Text>Conditional popover</Text></SimplePopover>
   </YStack>;
-}, openOnChangingTheCondition = (args) => <OnCondition {...args} />, ConditionalPopover = () => {
-  const [open, setOpen] = useState(!1), [inputVal, setInputVal] = useState("");
-  function handleInput(val) {
-    setOpen(val === "show"), setInputVal(val);
-  }
-  return <YStack space><SimplePopover
-    open={open}
-    onOpenChange={setOpen}
-    triggerElement={<YStack><Input value={inputVal} onChangeText={handleInput} placeholder="type show to get popup" /></YStack>}
-    arrow={!0}
-  ><Text>Conditional popover</Text></SimplePopover></YStack>;
-}, openOnAnyCondition = (args) => <ConditionalPopover {...args} />;
+}, openOnChangingTheCondition = (args) => <OnCondition {...args} />;
 var SimplePopover_stories_default = meta;
 export {
   closeOnHoverOut,
   SimplePopover_stories_default as default,
   main,
-  openOnAnyCondition,
   openOnChangingTheCondition,
   openOnHover
 };

package/dist/jsx/panels/SimplePopover/SimplePopover.stories.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/panels/SimplePopover/SimplePopover.stories.tsx"],
-  "mappings": "AAqBA,SAAgB,gBAAgB;AAChC,SAAS,qBAAqB;AAC9B,SAAS,MAAM,QAAQ,QAAQ,QAAQ,OAAO,aAAa;AAG3D,MAAM,OAAa;AAAA,EACjB,OAAO;AAAA,EACP,WAAW;AAAA,EACX,YAAY,EAAE,QAAQ,EAAE,MAAM,OAAO,EAAE;AACzC,GAEa,OAAO,MAClB,CAAC,cAGC,CAAC,OACC,CAAC,KAAK,eAAe,EAApB,KACH,EAFC,OAGH,EANC,gBASU,kBAAkB,MAC7B,CAAC;AAAA,EAEC;AAAA,CAEA,CAAC,OACC,CAAC,KAAK,sCAAsC,EAA3C,KACH,EAFC,OAGH,EAPC;AAUH,SAAS,OAAO;AACd,SACE,CAAC;AAAA,IAEC;AAAA,IACA,OAAO;AAAA,IACP,cAAc,EAAE,KAAK,UAAU,IAAI,SAAS;AAAA,GAE5C,CAAC,QACE,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,EAAE,EAAE,IAAI,CAAC,MACpC,CAAC,KAAK,KAAK,IAAI,EAAE,EAAhB,KACF,EACH,EAJC,OAKH,EAXC;AAaL;AAEO,MAAM,cAAc,MACzB,CAAC,OAAO,GAAG;AAAA,EACT,CAAC,KAAK;AAAA,EACN,CAAC,KAAK;AACR,EAHC,SAMG,cAAc,CAAC,UAAU;AAC7B,QAAM,CAAC,MAAM,OAAO,IAAI,SAAS,EAAK;AACtC,SACE,CAAC,OAAO;AAAA,IACN,CAAC,MAAM,gCAAgC,EAAtC;AAAA,IACD,CAAC,OAAO,SAAS,MAAM,MAAM,iBAAiB,SAAS;AAAA,IACvD,CAAC;AAAA,MACC,MAAM;AAAA,MACN,cAAc;AAAA,KAGd,CAAC,KAAK,mBAAmB,EAAxB,KACH,EANC;AAAA,EAOH,EAVC;AAYL,GAEa,6BAA6B,CAAC,SAAS,CAAC,gBAAgB,MAAM,IAErE,qBAAqB,MAAM;AAC/B,QAAM,CAAC,MAAM,OAAO,IAAI,SAAS,EAAK,GAChC,CAAC,UAAU,WAAW,IAAI,SAAS,EAAE;AAE3C,WAAS,YAAY,KAAK;AACxB,IAAoB,QAAhB,QAAQ,MAAoB,GAEhC,YAAY,GAAG;AAAA,EACjB;AAEA,SACE,CAAC,OAAO,MACN,CAAC;AAAA,IACC,MAAM;AAAA,IACN,cAAc;AAAA,IACd,gBACE,CAAC,OACC,CAAC,MAAM,OAAO,UAAU,cAAc,aAAa,YAAY,yBAAyB,EAC1F,EAFC;AAAA,IAIH,OAAO;AAAA,GAEP,CAAC,KAAK,mBAAmB,EAAxB,KACH,EAXC,cAYH,EAbC;AAeL,GAEa,qBAAqB,CAAC,SAAS,CAAC,uBAAuB,MAAM;AAE1E,IAAO,gCAAQ;",
+  "mappings": "AAqBA,SAAgB,gBAAgB;AAChC,SAAS,qBAAqB;AAC9B,SAAS,MAAM,QAAQ,QAAQ,QAAe,OAAO,cAAc;AAGnE,MAAM,OAAa;AAAA,EACjB,OAAO;AAAA,EACP,WAAW;AAAA,EACX,YAAY,EAAE,QAAQ,EAAE,MAAM,OAAO,EAAE;AACzC,GAEa,OAAO,MAClB,CAAC,cAAc,SAAS,CAAC,OAAO,2BAA2B,EAAlC,SACvB,CAAC,OACC,CAAC,KAAK,eAAe,EAApB,KACH,EAFC,OAGH,EAJC,gBAOU,kBAAkB,MAC7B,CAAC,cAAc,SAAS,CAAC,OAAO,UAAU,EAAjB,SAA4B,gBACnD,CAAC,OACC,CAAC,KAAK,sCAAsC,EAA3C,KACH,EAFC,OAGH,EAJC;AAOH,SAAS,OAAO;AACd,SACE,CAAC;AAAA,IACC,SAAS,CAAC,OAAO,0BAA0B,EAAjC;AAAA,IACV;AAAA,IACA,OAAO;AAAA,IACP,cAAc,EAAE,KAAK,UAAU,IAAI,SAAS;AAAA,IAC5C;AAAA,GAEA,CAAC,QACE,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,EAAE,EAAE,IAAI,CAAC,MACpC,CAAC,KAAK,KAAK,IAAI,EAAE,EAAhB,KACF,EACH,EAJC,OAKH,EAZC;AAcL;AAEO,MAAM,cAAc,MACzB,CAAC,OAAO,GAAG;AAAA,EACT,CAAC,KAAK;AAAA,EACN,CAAC,KAAK;AACR,EAHC,SAMG,cAAc,CAAC,UAAU;AAC7B,QAAM,CAAC,MAAM,OAAO,IAAI,SAAS,EAAK;AACtC,SACE,CAAC,OAAO;AAAA,IACN,CAAC,MAAM,gCAAgC,EAAtC;AAAA,IACD,CAAC,OAAO,SAAS,MAAM,MAAM,iBAAiB,SAAS;AAAA,IACvD,CAAC,cAAc,MAAM,MAAM,cAAc,SAAS,SAAS,CAAC,OAAO,oBAAoB,EAA3B,SAC1D,CAAC,KAAK,mBAAmB,EAAxB,KACH,EAFC;AAAA,EAGH,EANC;AAQL,GAEa,6BAA6B,CAAC,SAAS,CAAC,gBAAgB,MAAM;AAE3E,IAAO,gCAAQ;",
   "names": []
 }

package/dist/jsx/panels/SimplePopover/SimplePopover.stories.native.js

@@ -1,18 +1,18 @@
 import { useState } from "react";
 import { SimplePopover } from "./index";
-import { Text, YStack, XStack, Switch, Input, Label } from "tamagui";
+import { Text, YStack, XStack, Switch, Label, Button } from "tamagui";
 const meta = {
   title: "panels/SimplePopover",
   component: SimplePopover,
   parameters: { status: { type: "beta" } }
-}, main = () => <SimplePopover><YStack><Text>popover content</Text></YStack></SimplePopover>, closeOnHoverOut = () => <SimplePopover
-  closeOnHoverOut
-><YStack><Text>popover content will close on hoverOut</Text></YStack></SimplePopover>;
+}, main = () => <SimplePopover trigger={<Button>Click here to get a Popover</Button>}><YStack><Text>popover content</Text></YStack></SimplePopover>, closeOnHoverOut = () => <SimplePopover trigger={<Button>click here</Button>} closeOnHoverOut><YStack><Text>popover content will close on hoverOut</Text></YStack></SimplePopover>;
 function Open() {
   return <SimplePopover
+    trigger={<Button>hover on it to get Popover</Button>}
     triggerOnHover
     arrow={!1}
     triggerStyle={{ als: "center", ai: "center" }}
+    closeOnHoverOut
   ><YStack>{[1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map((i) => <Text key={i}>{i}</Text>)}</YStack></SimplePopover>;
 }
 const openOnHover = () => <XStack jc="space-around">
@@ -23,29 +23,14 @@ const openOnHover = () => <XStack jc="space-around">
   return <YStack space>
     <Label>change the switch to get popover</Label>
     <Switch checked={props.open} onCheckedChange={setOpen} />
-    <SimplePopover
-      open={open}
-      onOpenChange={setOpen}
-    ><Text>Conditional popover</Text></SimplePopover>
+    <SimplePopover open={open} onOpenChange={setOpen} trigger={<Button>Popup will open here</Button>}><Text>Conditional popover</Text></SimplePopover>
   </YStack>;
-}, openOnChangingTheCondition = (args) => <OnCondition {...args} />, ConditionalPopover = () => {
-  const [open, setOpen] = useState(!1), [inputVal, setInputVal] = useState("");
-  function handleInput(val) {
-    setOpen(val === "show"), setInputVal(val);
-  }
-  return <YStack space><SimplePopover
-    open={open}
-    onOpenChange={setOpen}
-    triggerElement={<YStack><Input value={inputVal} onChangeText={handleInput} placeholder="type show to get popup" /></YStack>}
-    arrow={!0}
-  ><Text>Conditional popover</Text></SimplePopover></YStack>;
-}, openOnAnyCondition = (args) => <ConditionalPopover {...args} />;
+}, openOnChangingTheCondition = (args) => <OnCondition {...args} />;
 var SimplePopover_stories_default = meta;
 export {
   closeOnHoverOut,
   SimplePopover_stories_default as default,
   main,
-  openOnAnyCondition,
   openOnChangingTheCondition,
   openOnHover
 };

package/dist/jsx/panels/SimplePopover/SimplePopover.stories.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/panels/SimplePopover/SimplePopover.stories.tsx"],
-  "mappings": "AAqBA,SAAgB,gBAAgB;AAChC,SAAS,qBAAqB;AAC9B,SAAS,MAAM,QAAQ,QAAQ,QAAQ,OAAO,aAAa;AAG3D,MAAM,OAAa;AAAA,EACjB,OAAO;AAAA,EACP,WAAW;AAAA,EACX,YAAY,EAAE,QAAQ,EAAE,MAAM,OAAO,EAAE;AACzC,GAEa,OAAO,MAClB,CAAC,cAGC,CAAC,OACC,CAAC,KAAK,eAAe,EAApB,KACH,EAFC,OAGH,EANC,gBASU,kBAAkB,MAC7B,CAAC;AAAA,EAEC;AAAA,CAEA,CAAC,OACC,CAAC,KAAK,sCAAsC,EAA3C,KACH,EAFC,OAGH,EAPC;AAUH,SAAS,OAAO;AACd,SACE,CAAC;AAAA,IAEC;AAAA,IACA,OAAO;AAAA,IACP,cAAc,EAAE,KAAK,UAAU,IAAI,SAAS;AAAA,GAE5C,CAAC,QACE,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,EAAE,EAAE,IAAI,CAAC,MACpC,CAAC,KAAK,KAAK,IAAI,EAAE,EAAhB,KACF,EACH,EAJC,OAKH,EAXC;AAaL;AAEO,MAAM,cAAc,MACzB,CAAC,OAAO,GAAG;AAAA,EACT,CAAC,KAAK;AAAA,EACN,CAAC,KAAK;AACR,EAHC,SAMG,cAAc,CAAC,UAAU;AAC7B,QAAM,CAAC,MAAM,OAAO,IAAI,SAAS,EAAK;AACtC,SACE,CAAC,OAAO;AAAA,IACN,CAAC,MAAM,gCAAgC,EAAtC;AAAA,IACD,CAAC,OAAO,SAAS,MAAM,MAAM,iBAAiB,SAAS;AAAA,IACvD,CAAC;AAAA,MACC,MAAM;AAAA,MACN,cAAc;AAAA,KAGd,CAAC,KAAK,mBAAmB,EAAxB,KACH,EANC;AAAA,EAOH,EAVC;AAYL,GAEa,6BAA6B,CAAC,SAAS,CAAC,gBAAgB,MAAM,IAErE,qBAAqB,MAAM;AAC/B,QAAM,CAAC,MAAM,OAAO,IAAI,SAAS,EAAK,GAChC,CAAC,UAAU,WAAW,IAAI,SAAS,EAAE;AAE3C,WAAS,YAAY,KAAK;AACxB,IAAoB,QAAhB,QAAQ,MAAoB,GAEhC,YAAY,GAAG;AAAA,EACjB;AAEA,SACE,CAAC,OAAO,MACN,CAAC;AAAA,IACC,MAAM;AAAA,IACN,cAAc;AAAA,IACd,gBACE,CAAC,OACC,CAAC,MAAM,OAAO,UAAU,cAAc,aAAa,YAAY,yBAAyB,EAC1F,EAFC;AAAA,IAIH,OAAO;AAAA,GAEP,CAAC,KAAK,mBAAmB,EAAxB,KACH,EAXC,cAYH,EAbC;AAeL,GAEa,qBAAqB,CAAC,SAAS,CAAC,uBAAuB,MAAM;AAE1E,IAAO,gCAAQ;",
+  "mappings": "AAqBA,SAAgB,gBAAgB;AAChC,SAAS,qBAAqB;AAC9B,SAAS,MAAM,QAAQ,QAAQ,QAAe,OAAO,cAAc;AAGnE,MAAM,OAAa;AAAA,EACjB,OAAO;AAAA,EACP,WAAW;AAAA,EACX,YAAY,EAAE,QAAQ,EAAE,MAAM,OAAO,EAAE;AACzC,GAEa,OAAO,MAClB,CAAC,cAAc,SAAS,CAAC,OAAO,2BAA2B,EAAlC,SACvB,CAAC,OACC,CAAC,KAAK,eAAe,EAApB,KACH,EAFC,OAGH,EAJC,gBAOU,kBAAkB,MAC7B,CAAC,cAAc,SAAS,CAAC,OAAO,UAAU,EAAjB,SAA4B,gBACnD,CAAC,OACC,CAAC,KAAK,sCAAsC,EAA3C,KACH,EAFC,OAGH,EAJC;AAOH,SAAS,OAAO;AACd,SACE,CAAC;AAAA,IACC,SAAS,CAAC,OAAO,0BAA0B,EAAjC;AAAA,IACV;AAAA,IACA,OAAO;AAAA,IACP,cAAc,EAAE,KAAK,UAAU,IAAI,SAAS;AAAA,IAC5C;AAAA,GAEA,CAAC,QACE,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,EAAE,EAAE,IAAI,CAAC,MACpC,CAAC,KAAK,KAAK,IAAI,EAAE,EAAhB,KACF,EACH,EAJC,OAKH,EAZC;AAcL;AAEO,MAAM,cAAc,MACzB,CAAC,OAAO,GAAG;AAAA,EACT,CAAC,KAAK;AAAA,EACN,CAAC,KAAK;AACR,EAHC,SAMG,cAAc,CAAC,UAAU;AAC7B,QAAM,CAAC,MAAM,OAAO,IAAI,SAAS,EAAK;AACtC,SACE,CAAC,OAAO;AAAA,IACN,CAAC,MAAM,gCAAgC,EAAtC;AAAA,IACD,CAAC,OAAO,SAAS,MAAM,MAAM,iBAAiB,SAAS;AAAA,IACvD,CAAC,cAAc,MAAM,MAAM,cAAc,SAAS,SAAS,CAAC,OAAO,oBAAoB,EAA3B,SAC1D,CAAC,KAAK,mBAAmB,EAAxB,KACH,EAFC;AAAA,EAGH,EANC;AAQL,GAEa,6BAA6B,CAAC,SAAS,CAAC,gBAAgB,MAAM;AAE3E,IAAO,gCAAQ;",
   "names": []
 }

package/dist/jsx/panels/SimplePopover/index.js

@@ -1,16 +1,5 @@
-import { Adapt, Popover, PopperAnchor, View, getState, useComposedRefs, usePopoverContext } from "tamagui";
+import { Adapt, Popover } from "tamagui";
 import React from "react";
-import { YStack } from "tamagui";
-const SimplePopoverTrigger = React.forwardRef((props, forwardedRef) => {
-  const context = usePopoverContext(), composedTriggerRef = useComposedRefs(forwardedRef, context.triggerRef), trigger = <View
-    aria-haspopup="dialog"
-    aria-expanded={context.open}
-    data-state={getState(context.open)}
-    {...props}
-    ref={composedTriggerRef}
-  />;
-  return context.hasCustomAnchor ? trigger : <PopperAnchor asChild>{trigger}</PopperAnchor>;
-});
 function SimplePopover({
   children,
   contentStyle,
@@ -19,12 +8,18 @@ function SimplePopover({
   arrow = !0,
   triggerOnHover,
   closeOnHoverOut,
+  trigger,
   ...props
 }) {
-  const [open, setOpen] = React.useState(!1), trigger = "trigger" in props;
+  const [open, setOpen] = React.useState(!1);
+  function handleHoverIn(e) {
+    triggerOnHover && (setOpen(!0), contentStyle?.onHoverIn && contentStyle?.onHoverIn(e), triggerStyle?.onHoverIn && triggerStyle.onHoverIn(e));
+  }
+  function handleHoverOut(e) {
+    closeOnHoverOut && (setOpen(!1), contentStyle?.onHoverOut && contentStyle.onHoverOut(e), triggerStyle?.onHoverOut && triggerStyle.onHoverOut(e));
+  }
   return <Popover size="$5" allowFlip open={open} onOpenChange={setOpen} {...props}>
-    {trigger && props.trigger && <Popover.Trigger asChild>{triggerOnHover ? <YStack onHoverIn={() => setOpen(!0)} onHoverOut={() => setOpen(!1)} {...triggerStyle}>{props.trigger}</YStack> : props.trigger}</Popover.Trigger>}
-    {!trigger && "triggerElement" in props && "open" in props && <SimplePopoverTrigger asChild>{props.triggerElement}</SimplePopoverTrigger>}
+    <Popover.Trigger asChild {...triggerStyle} onHoverIn={handleHoverIn} onHoverOut={handleHoverOut}>{trigger}</Popover.Trigger>
     <Adapt when="sm" platform="touch"><Popover.Sheet modal dismissOnSnapToBottom>
       <Popover.Sheet.Frame padding="$4" onMouseEnter={() => setOpen(!0)}><Adapt.Contents /></Popover.Sheet.Frame>
       <Popover.Sheet.Overlay />
@@ -46,10 +41,10 @@ function SimplePopover({
         }
       ]}
       elevate
-      onHoverIn={triggerOnHover ? () => setOpen(!0) : void 0}
-      onHoverOut={triggerOnHover || closeOnHoverOut ? () => setOpen(!1) : void 0}
       zi={9999999999}
       {...contentStyle}
+      onHoverIn={handleHoverIn}
+      onHoverOut={handleHoverOut}
     >
       {arrow && <Popover.Arrow borderWidth={1} borderColor="$borderColor" {...arrowStyle} />}
       {children}
@@ -57,7 +52,6 @@ function SimplePopover({
   </Popover>;
 }
 export {
-  SimplePopover,
-  SimplePopoverTrigger
+  SimplePopover
 };
 //# sourceMappingURL=index.js.map

package/dist/jsx/panels/SimplePopover/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/panels/SimplePopover/index.tsx"],
-  "mappings": "AA8BA,SAAS,OAAO,SAAS,cAAc,MAAM,UAAU,iBAAiB,yBAAyB;AACjG,OAAO,WAAW;AAElB,SAAS,cAAc;AAqBhB,MAAM,uBAAuB,MAAM,WAAuC,CAAC,OAAmB,iBAAiB;AACpH,QAAM,UAAU,kBAAkB,GAC5B,qBAAqB,gBAAgB,cAAc,QAAQ,UAAU,GAErE,UACJ,CAAC;AAAA,IACC,cAAc;AAAA,IACd,eAAe,QAAQ;AAAA,IACvB,YAAY,SAAS,QAAQ,IAAI;AAAA,QAC7B;AAAA,IACJ,KAAK;AAAA,EACP;AAGF,SAAO,QAAQ,kBAAkB,UAAU,CAAC,aAAa,SAAS,QAAQ,EAA9B;AAC9C,CAAC;AAEM,SAAS,cAAc;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAAuB;AACrB,QAAM,CAAC,MAAM,OAAO,IAAI,MAAM,SAAS,EAAK,GACtC,UAAU,aAAa;AAE7B,SACE,CAAC,QAAQ,KAAK,KAAK,UAAU,MAAM,MAAM,cAAc,aAAa;AAAA,KACjE,WACC,MAAM,WAEJ,CAAC,QAAQ,QAAQ,SACd,iBACC,CAAC,OAAO,WAAW,MAAM,QAAQ,EAAI,GAAG,YAAY,MAAM,QAAQ,EAAK,OAAO,eAC3E,MAAM,QACT,EAFC,UAID,MAAM,QAEV,EARC,QAAQ;AAAA,KAUZ,CAAC,WAAW,oBAAoB,SAAS,UAAU,SAClD,CAAC,qBAAqB,SAAS,MAAM,eAAe,EAAnD;AAAA,IAGH,CAAC,MAAM,KAAK,KAAK,SAAS,QACxB,CAAC,QAAQ,MAAM,MAAM;AAAA,MACnB,CAAC,QAAQ,MAAM,MAAM,QAAQ,KAAK,cAAc,MAAM,QAAQ,EAAI,GAChE,CAAC,MAAM,SAAS,EAClB,EAFC,QAAQ,MAAM;AAAA,MAGf,CAAC,QAAQ,MAAM,QAAQ;AAAA,IACzB,EALC,QAAQ,MAMX,EAPC;AAAA,IAQD,CAAC,QAAQ;AAAA,MACP,aAAa;AAAA,MACb,YAAY;AAAA,MACZ,YAAY,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,MACvC,WAAY,iBAAgD,SAA/B,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,MACxD,GAAG;AAAA,MACH,GAAG;AAAA,MACH,SAAS;AAAA,MACT,WACG,iBASG,SARA;AAAA,QACE;AAAA,QACA;AAAA,UACE,SAAS;AAAA,YACP,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF;AAAA,MAGN;AAAA,MACA,WAAW,iBAAiB,MAAM,QAAQ,EAAI,IAAI;AAAA,MAClD,YAAY,kBAAkB,kBAAkB,MAAM,QAAQ,EAAK,IAAI;AAAA,MACvE,IAAI;AAAA,UACA;AAAA;AAAA,OAEH,SAAS,CAAC,QAAQ,MAAM,aAAa,GAAG,YAAY,mBAAmB,YAAY;AAAA,OACnF;AAAA,IACH,EA5BC,QAAQ;AAAA,EA6BX,EAvDC;AAyDL;",
+  "mappings": "AAsBA,SAAS,OAAO,eAAe;AAC/B,OAAO,WAAW;AAeX,SAAS,cAAc;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAAuB;AACrB,QAAM,CAAC,MAAM,OAAO,IAAI,MAAM,SAAS,EAAK;AAE5C,WAAS,cAAc,GAAG;AACxB,IAAK,mBACL,QAAQ,EAAI,GACR,cAAc,aAAW,cAAc,UAAU,CAAC,GAClD,cAAc,aAAW,aAAa,UAAU,CAAC;AAAA,EACvD;AAEA,WAAS,eAAe,GAAG;AACzB,IAAK,oBACL,QAAQ,EAAK,GACT,cAAc,cAAY,aAAa,WAAW,CAAC,GACnD,cAAc,cAAY,aAAa,WAAW,CAAC;AAAA,EACzD;AAEA,SACE,CAAC,QAAQ,KAAK,KAAK,UAAU,MAAM,MAAM,cAAc,aAAa;AAAA,IAClE,CAAC,QAAQ,QAAQ,YAAY,cAAc,WAAW,eAAe,YAAY,iBAC9E,QACH,EAFC,QAAQ;AAAA,IAGT,CAAC,MAAM,KAAK,KAAK,SAAS,QACxB,CAAC,QAAQ,MAAM,MAAM;AAAA,MACnB,CAAC,QAAQ,MAAM,MAAM,QAAQ,KAAK,cAAc,MAAM,QAAQ,EAAI,GAChE,CAAC,MAAM,SAAS,EAClB,EAFC,QAAQ,MAAM;AAAA,MAGf,CAAC,QAAQ,MAAM,QAAQ;AAAA,IACzB,EALC,QAAQ,MAMX,EAPC;AAAA,IAQD,CAAC,QAAQ;AAAA,MACP,aAAa;AAAA,MACb,YAAY;AAAA,MACZ,YAAY,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,MACvC,WAAY,iBAAgD,SAA/B,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,MACxD,GAAG;AAAA,MACH,GAAG;AAAA,MACH,SAAS;AAAA,MACT,WACG,iBASG,SARA;AAAA,QACE;AAAA,QACA;AAAA,UACE,SAAS;AAAA,YACP,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF;AAAA,MAGN;AAAA,MACA,IAAI;AAAA,UACA;AAAA,MACJ,WAAW;AAAA,MACX,YAAY;AAAA;AAAA,OAEX,SAAS,CAAC,QAAQ,MAAM,aAAa,GAAG,YAAY,mBAAmB,YAAY;AAAA,OACnF;AAAA,IACH,EA5BC,QAAQ;AAAA,EA6BX,EAzCC;AA2CL;",
   "names": []
 }

package/dist/jsx/panels/SimplePopover/index.native.js

@@ -1,16 +1,5 @@
-import { Adapt, Popover, PopperAnchor, View, getState, useComposedRefs, usePopoverContext } from "tamagui";
+import { Adapt, Popover } from "tamagui";
 import React from "react";
-import { YStack } from "tamagui";
-const SimplePopoverTrigger = React.forwardRef((props, forwardedRef) => {
-  const context = usePopoverContext(), composedTriggerRef = useComposedRefs(forwardedRef, context.triggerRef), trigger = <View
-    aria-haspopup="dialog"
-    aria-expanded={context.open}
-    data-state={getState(context.open)}
-    {...props}
-    ref={composedTriggerRef}
-  />;
-  return context.hasCustomAnchor ? trigger : <PopperAnchor asChild>{trigger}</PopperAnchor>;
-});
 function SimplePopover({
   children,
   contentStyle,
@@ -19,12 +8,18 @@ function SimplePopover({
   arrow = !0,
   triggerOnHover,
   closeOnHoverOut,
+  trigger,
   ...props
 }) {
-  const [open, setOpen] = React.useState(!1), trigger = "trigger" in props;
+  const [open, setOpen] = React.useState(!1);
+  function handleHoverIn(e) {
+    triggerOnHover && (setOpen(!0), contentStyle != null && contentStyle.onHoverIn && (contentStyle == null || contentStyle.onHoverIn(e)), triggerStyle != null && triggerStyle.onHoverIn && triggerStyle.onHoverIn(e));
+  }
+  function handleHoverOut(e) {
+    closeOnHoverOut && (setOpen(!1), contentStyle != null && contentStyle.onHoverOut && contentStyle.onHoverOut(e), triggerStyle != null && triggerStyle.onHoverOut && triggerStyle.onHoverOut(e));
+  }
   return <Popover size="$5" allowFlip open={open} onOpenChange={setOpen} {...props}>
-    {trigger && props.trigger && <Popover.Trigger asChild>{triggerOnHover ? <YStack onHoverIn={() => setOpen(!0)} onHoverOut={() => setOpen(!1)} {...triggerStyle}>{props.trigger}</YStack> : props.trigger}</Popover.Trigger>}
-    {!trigger && "triggerElement" in props && "open" in props && <SimplePopoverTrigger asChild>{props.triggerElement}</SimplePopoverTrigger>}
+    <Popover.Trigger asChild {...triggerStyle} onHoverIn={handleHoverIn} onHoverOut={handleHoverOut}>{trigger}</Popover.Trigger>
     <Adapt when="sm" platform="touch"><Popover.Sheet modal dismissOnSnapToBottom>
       <Popover.Sheet.Frame padding="$4" onMouseEnter={() => setOpen(!0)}><Adapt.Contents /></Popover.Sheet.Frame>
       <Popover.Sheet.Overlay />
@@ -46,10 +41,10 @@ function SimplePopover({
         }
       ]}
       elevate
-      onHoverIn={triggerOnHover ? () => setOpen(!0) : void 0}
-      onHoverOut={triggerOnHover || closeOnHoverOut ? () => setOpen(!1) : void 0}
       zi={9999999999}
       {...contentStyle}
+      onHoverIn={handleHoverIn}
+      onHoverOut={handleHoverOut}
     >
       {arrow && <Popover.Arrow borderWidth={1} borderColor="$borderColor" {...arrowStyle} />}
       {children}
@@ -57,7 +52,6 @@ function SimplePopover({
   </Popover>;
 }
 export {
-  SimplePopover,
-  SimplePopoverTrigger
+  SimplePopover
 };
 //# sourceMappingURL=index.js.map

package/dist/jsx/panels/SimplePopover/index.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/panels/SimplePopover/index.tsx"],
-  "mappings": "AA8BA,SAAS,OAAO,SAAS,cAAc,MAAM,UAAU,iBAAiB,yBAAyB;AACjG,OAAO,WAAW;AAElB,SAAS,cAAc;AAqBhB,MAAM,uBAAuB,MAAM,WAAuC,CAAC,OAAmB,iBAAiB;AACpH,QAAM,UAAU,kBAAkB,GAC5B,qBAAqB,gBAAgB,cAAc,QAAQ,UAAU,GAErE,UACJ,CAAC;AAAA,IACC,cAAc;AAAA,IACd,eAAe,QAAQ;AAAA,IACvB,YAAY,SAAS,QAAQ,IAAI;AAAA,QAC7B;AAAA,IACJ,KAAK;AAAA,EACP;AAGF,SAAO,QAAQ,kBAAkB,UAAU,CAAC,aAAa,SAAS,QAAQ,EAA9B;AAC9C,CAAC;AAEM,SAAS,cAAc;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAAuB;AACrB,QAAM,CAAC,MAAM,OAAO,IAAI,MAAM,SAAS,EAAK,GACtC,UAAU,aAAa;AAE7B,SACE,CAAC,QAAQ,KAAK,KAAK,UAAU,MAAM,MAAM,cAAc,aAAa;AAAA,KACjE,WACC,MAAM,WAEJ,CAAC,QAAQ,QAAQ,SACd,iBACC,CAAC,OAAO,WAAW,MAAM,QAAQ,EAAI,GAAG,YAAY,MAAM,QAAQ,EAAK,OAAO,eAC3E,MAAM,QACT,EAFC,UAID,MAAM,QAEV,EARC,QAAQ;AAAA,KAUZ,CAAC,WAAW,oBAAoB,SAAS,UAAU,SAClD,CAAC,qBAAqB,SAAS,MAAM,eAAe,EAAnD;AAAA,IAGH,CAAC,MAAM,KAAK,KAAK,SAAS,QACxB,CAAC,QAAQ,MAAM,MAAM;AAAA,MACnB,CAAC,QAAQ,MAAM,MAAM,QAAQ,KAAK,cAAc,MAAM,QAAQ,EAAI,GAChE,CAAC,MAAM,SAAS,EAClB,EAFC,QAAQ,MAAM;AAAA,MAGf,CAAC,QAAQ,MAAM,QAAQ;AAAA,IACzB,EALC,QAAQ,MAMX,EAPC;AAAA,IAQD,CAAC,QAAQ;AAAA,MACP,aAAa;AAAA,MACb,YAAY;AAAA,MACZ,YAAY,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,MACvC,WAAY,iBAAgD,SAA/B,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,MACxD,GAAG;AAAA,MACH,GAAG;AAAA,MACH,SAAS;AAAA,MACT,WACG,iBASG,SARA;AAAA,QACE;AAAA,QACA;AAAA,UACE,SAAS;AAAA,YACP,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF;AAAA,MAGN;AAAA,MACA,WAAW,iBAAiB,MAAM,QAAQ,EAAI,IAAI;AAAA,MAClD,YAAY,kBAAkB,kBAAkB,MAAM,QAAQ,EAAK,IAAI;AAAA,MACvE,IAAI;AAAA,UACA;AAAA;AAAA,OAEH,SAAS,CAAC,QAAQ,MAAM,aAAa,GAAG,YAAY,mBAAmB,YAAY;AAAA,OACnF;AAAA,IACH,EA5BC,QAAQ;AAAA,EA6BX,EAvDC;AAyDL;",
+  "mappings": "AAsBA,SAAS,OAAO,eAAe;AAC/B,OAAO,WAAW;AAeX,SAAS,cAAc;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAAuB;AACrB,QAAM,CAAC,MAAM,OAAO,IAAI,MAAM,SAAS,EAAK;AAE5C,WAAS,cAAc,GAAG;AACxB,IAAK,mBACL,QAAQ,EAAI,GACR,qCAAc,cAAW,qCAAc,UAAU,KACjD,qCAAc,aAAW,aAAa,UAAU,CAAC;AAAA,EACvD;AAEA,WAAS,eAAe,GAAG;AACzB,IAAK,oBACL,QAAQ,EAAK,GACT,qCAAc,cAAY,aAAa,WAAW,CAAC,GACnD,qCAAc,cAAY,aAAa,WAAW,CAAC;AAAA,EACzD;AAEA,SACE,CAAC,QAAQ,KAAK,KAAK,UAAU,MAAM,MAAM,cAAc,aAAa;AAAA,IAClE,CAAC,QAAQ,QAAQ,YAAY,cAAc,WAAW,eAAe,YAAY,iBAC9E,QACH,EAFC,QAAQ;AAAA,IAGT,CAAC,MAAM,KAAK,KAAK,SAAS,QACxB,CAAC,QAAQ,MAAM,MAAM;AAAA,MACnB,CAAC,QAAQ,MAAM,MAAM,QAAQ,KAAK,cAAc,MAAM,QAAQ,EAAI,GAChE,CAAC,MAAM,SAAS,EAClB,EAFC,QAAQ,MAAM;AAAA,MAGf,CAAC,QAAQ,MAAM,QAAQ;AAAA,IACzB,EALC,QAAQ,MAMX,EAPC;AAAA,IAQD,CAAC,QAAQ;AAAA,MACP,aAAa;AAAA,MACb,YAAY;AAAA,MACZ,YAAY,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,MACvC,WAAY,iBAAgD,SAA/B,EAAE,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE;AAAA,MACxD,GAAG;AAAA,MACH,GAAG;AAAA,MACH,SAAS;AAAA,MACT,WACG,iBASG,SARA;AAAA,QACE;AAAA,QACA;AAAA,UACE,SAAS;AAAA,YACP,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF;AAAA,MAGN;AAAA,MACA,IAAI;AAAA,UACA;AAAA,MACJ,WAAW;AAAA,MACX,YAAY;AAAA;AAAA,OAEX,SAAS,CAAC,QAAQ,MAAM,aAAa,GAAG,YAAY,mBAAmB,YAAY;AAAA,OACnF;AAAA,IACH,EA5BC,QAAQ;AAAA,EA6BX,EAzCC;AA2CL;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/components",
-  "version": "0.7.4",
+  "version": "0.7.9",
   "sideEffects": [
     "*.css"
   ],
@@ -75,7 +75,7 @@
     "moti": "^0.27.0",
     "react-native-reanimated": "3.5.4",
     "solito": "^4.1.3",
-    "ui": "workspace:^"
+    "ui": "0.0.3"
   },
   "jest": {
     "testRegex": "((/(tests|__tests__)((/|/[^_.\n][^/\n]*(/[^_.\n][^/\n]+)*/)[^_.\n][^/\n]*))|((/|/.*/)(([^_.\n][^/\n]*.(spec|test))|(spec|test)))).[jt]sx?$",

package/src/panels/SimplePopover/SimplePopover.stories.tsx

@@ -21,7 +21,7 @@
 
 import React, { useState } from 'react';
 import { SimplePopover } from './index';
-import { Text, YStack, XStack, Switch, Input, Label } from 'tamagui';
+import { Text, YStack, XStack, Switch, Input, Label, Button } from 'tamagui';
 import type { Meta } from '@storybook/react';
 
 const meta: Meta = {
@@ -31,9 +31,7 @@ const meta: Meta = {
 };
 
 export const main = () => (
-  <SimplePopover
-  // trigger={<Button>Click here to get a Popover</Button>}
-  >
+  <SimplePopover trigger={<Button>Click here to get a Popover</Button>}>
     <YStack>
       <Text>popover content</Text>
     </YStack>
@@ -41,10 +39,7 @@ export const main = () => (
 );
 
 export const closeOnHoverOut = () => (
-  <SimplePopover
-    // trigger={<Button>click here</Button>}
-    closeOnHoverOut
-  >
+  <SimplePopover trigger={<Button>click here</Button>} closeOnHoverOut>
     <YStack>
       <Text>popover content will close on hoverOut</Text>
     </YStack>
@@ -54,10 +49,11 @@ export const closeOnHoverOut = () => (
 function Open() {
   return (
     <SimplePopover
-      // trigger={<Button>hover on it to get Popover</Button>}
+      trigger={<Button>hover on it to get Popover</Button>}
       triggerOnHover
       arrow={false}
       triggerStyle={{ als: 'center', ai: 'center' }}
+      closeOnHoverOut
     >
       <YStack>
         {[1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map((i) => (
@@ -81,11 +77,7 @@ const OnCondition = (props) => {
     <YStack space>
       <Label>change the switch to get popover</Label>
       <Switch checked={props.open} onCheckedChange={setOpen} />
-      <SimplePopover
-        open={open}
-        onOpenChange={setOpen}
-        // trigger={<Button>Popup will open here</Button>}
-      >
+      <SimplePopover open={open} onOpenChange={setOpen} trigger={<Button>Popup will open here</Button>}>
         <Text>Conditional popover</Text>
       </SimplePopover>
     </YStack>
@@ -94,34 +86,4 @@ const OnCondition = (props) => {
 
 export const openOnChangingTheCondition = (args) => <OnCondition {...args} />;
 
-const ConditionalPopover = () => {
-  const [open, setOpen] = useState(false);
-  const [inputVal, setInputVal] = useState('');
-
-  function handleInput(val) {
-    if (val === 'show') setOpen(true);
-    else setOpen(false);
-    setInputVal(val);
-  }
-
-  return (
-    <YStack space>
-      <SimplePopover
-        open={open}
-        onOpenChange={setOpen}
-        triggerElement={
-          <YStack>
-            <Input value={inputVal} onChangeText={handleInput} placeholder="type show to get popup" />
-          </YStack>
-        }
-        arrow={true}
-      >
-        <Text>Conditional popover</Text>
-      </SimplePopover>
-    </YStack>
-  );
-};
-
-export const openOnAnyCondition = (args) => <ConditionalPopover {...args} />;
-
 export default meta;

package/src/panels/SimplePopover/index.tsx

@@ -19,55 +19,22 @@
  * limitations under the License.
  */
 
-import type {
-  PopoverArrowProps,
-  PopoverContentProps,
-  PopoverProps,
-  PopoverTriggerProps,
-  StackProps,
-  TamaguiElement,
-  YStackProps,
-} from 'tamagui';
-import { Adapt, Popover, PopperAnchor, View, getState, useComposedRefs, usePopoverContext } from 'tamagui';
+import type { PopoverArrowProps, PopoverContentProps, PopoverProps, PopoverTriggerProps } from 'tamagui';
+import { Adapt, Popover } from 'tamagui';
 import React from 'react';
 import type { ReactNode } from 'react';
-import { YStack } from 'tamagui';
 
-export interface PopoverCustomProps {
+export type SimplePopoverProps = PopoverProps & {
   contentStyle?: PopoverContentProps;
   arrowStyle?: PopoverArrowProps;
-  triggerStyle?: YStackProps;
+  triggerStyle?: PopoverTriggerProps;
   triggerOnHover?: boolean;
   closeOnHoverOut?: boolean;
   arrow?: boolean;
   open?: boolean;
   setOpen?: (open: boolean) => void;
-}
-
-export interface PopoverOpen {
-  triggerElement: ReactNode;
-}
-
-export type ExclusiveTriggerProps = PopoverTriggerProps | PopoverOpen;
-
-export type SimplePopoverProps = PopoverProps & PopoverCustomProps & ExclusiveTriggerProps;
-
-export const SimplePopoverTrigger = React.forwardRef<TamaguiElement, StackProps>((props: StackProps, forwardedRef) => {
-  const context = usePopoverContext();
-  const composedTriggerRef = useComposedRefs(forwardedRef, context.triggerRef);
-
-  const trigger = (
-    <View
-      aria-haspopup="dialog"
-      aria-expanded={context.open}
-      data-state={getState(context.open)}
-      {...props}
-      ref={composedTriggerRef}
-    />
-  );
-
-  return context.hasCustomAnchor ? trigger : <PopperAnchor asChild>{trigger}</PopperAnchor>;
-});
+  trigger: ReactNode;
+};
 
 export function SimplePopover({
   children,
@@ -77,30 +44,30 @@ export function SimplePopover({
   arrow = true,
   triggerOnHover,
   closeOnHoverOut,
+  trigger,
   ...props
 }: SimplePopoverProps) {
   const [open, setOpen] = React.useState(false);
-  const trigger = 'trigger' in props;
+
+  function handleHoverIn(e) {
+    if (!triggerOnHover) return;
+    setOpen(true);
+    if (contentStyle?.onHoverIn) contentStyle?.onHoverIn(e);
+    if (triggerStyle?.onHoverIn) triggerStyle.onHoverIn(e);
+  }
+
+  function handleHoverOut(e) {
+    if (!closeOnHoverOut) return;
+    setOpen(false);
+    if (contentStyle?.onHoverOut) contentStyle.onHoverOut(e);
+    if (triggerStyle?.onHoverOut) triggerStyle.onHoverOut(e);
+  }
 
   return (
     <Popover size="$5" allowFlip open={open} onOpenChange={setOpen} {...props}>
-      {trigger &&
-        props.trigger &&
-        ((
-          <Popover.Trigger asChild>
-            {triggerOnHover ? (
-              <YStack onHoverIn={() => setOpen(true)} onHoverOut={() => setOpen(false)} {...triggerStyle}>
-                {props.trigger}
-              </YStack>
-            ) : (
-              props.trigger
-            )}
-          </Popover.Trigger>
-        ) as any)}
-      {!trigger && 'triggerElement' in props && 'open' in props && (
-        <SimplePopoverTrigger asChild>{props.triggerElement}</SimplePopoverTrigger>
-      )}
-
+      <Popover.Trigger asChild {...triggerStyle} onHoverIn={handleHoverIn} onHoverOut={handleHoverOut}>
+        {trigger}
+      </Popover.Trigger>
       <Adapt when="sm" platform="touch">
         <Popover.Sheet modal dismissOnSnapToBottom>
           <Popover.Sheet.Frame padding="$4" onMouseEnter={() => setOpen(true)}>
@@ -130,10 +97,10 @@ export function SimplePopover({
             : undefined
         }
         elevate
-        onHoverIn={triggerOnHover ? () => setOpen(true) : undefined}
-        onHoverOut={triggerOnHover || closeOnHoverOut ? () => setOpen(false) : undefined}
         zi={9999999999}
         {...contentStyle}
+        onHoverIn={handleHoverIn}
+        onHoverOut={handleHoverOut}
       >
         {arrow && <Popover.Arrow borderWidth={1} borderColor="$borderColor" {...arrowStyle} />}
         {children}

package/types/panels/SimplePopover/SimplePopover.stories.d.ts

@@ -25,6 +25,5 @@ export declare const main: () => React.JSX.Element;
 export declare const closeOnHoverOut: () => React.JSX.Element;
 export declare const openOnHover: () => React.JSX.Element;
 export declare const openOnChangingTheCondition: (args: any) => React.JSX.Element;
-export declare const openOnAnyCondition: (args: any) => React.JSX.Element;
 export default meta;
 //# sourceMappingURL=SimplePopover.stories.d.ts.map

package/types/panels/SimplePopover/SimplePopover.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SimplePopover.stories.d.ts","sourceRoot":"","sources":["../../../src/panels/SimplePopover/SimplePopover.stories.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,QAAA,MAAM,IAAI,EAAE,IAIX,CAAC;AAEF,eAAO,MAAM,IAAI,yBAQhB,CAAC;AAEF,eAAO,MAAM,eAAe,yBAS3B,CAAC;AAmBF,eAAO,MAAM,WAAW,yBAKvB,CAAC;AAmBF,eAAO,MAAM,0BAA0B,kCAAsC,CAAC;AA8B9E,eAAO,MAAM,kBAAkB,kCAA6C,CAAC;AAE7E,eAAe,IAAI,CAAC"}
+{"version":3,"file":"SimplePopover.stories.d.ts","sourceRoot":"","sources":["../../../src/panels/SimplePopover/SimplePopover.stories.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,QAAA,MAAM,IAAI,EAAE,IAIX,CAAC;AAEF,eAAO,MAAM,IAAI,yBAMhB,CAAC;AAEF,eAAO,MAAM,eAAe,yBAM3B,CAAC;AAoBF,eAAO,MAAM,WAAW,yBAKvB,CAAC;AAeF,eAAO,MAAM,0BAA0B,kCAAsC,CAAC;AAE9E,eAAe,IAAI,CAAC"}