diff --git a/src/quo/animated.cljs b/src/quo/animated.cljs index 7dc4ee764fd7..80b57e5aff85 100644 --- a/src/quo/animated.cljs +++ b/src/quo/animated.cljs @@ -163,11 +163,9 @@ (defn loop* [opts] (ocall redash "loop" (clj->js opts))) -(defn use-value [value] - (.useValue ^js redash value)) +(def use-value (.-useValue ^js redash)) -(defn use-clock [] - (.useClock ^js redash)) +(def use-clock (.-useClock ^js redash)) (defn snap-point [value velocity snap-points] (.snapPoint ^js redash value velocity (to-array snap-points))) diff --git a/src/quo/components/bottom_sheet/view.cljs b/src/quo/components/bottom_sheet/view.cljs index d740d54ffecb..d356db0de077 100644 --- a/src/quo/components/bottom_sheet/view.cljs +++ b/src/quo/components/bottom_sheet/view.cljs @@ -24,7 +24,7 @@ (when visible (into [:<>] children)) (into [rn/modal props] children))) -(defn bottom-sheet-raw [props] +(defn bottom-sheet-hooks [props] (let [{on-cancel :onCancel disable-drag? :disableDrag? show-handle? :showHandle? @@ -167,7 +167,7 @@ (when back-button-cancel (close-sheet)))} [rn/view {:style styles/container - :pointer-events :box-none} + :pointer-events (if visible? :box-none :none)} [gesture-handler/tap-gesture-handler (merge {:enabled backdrop-dismiss?} tap-gesture-handler) [animated/view {:style (merge (styles/backdrop) @@ -201,5 +201,7 @@ :on-layout on-layout} (into [:<>] (react/get-children children))]]]]]]]))) +(def bottom-sheet-adapted (reagent/adapt-react-class bottom-sheet-hooks)) + (defn bottom-sheet [props & children] - (into [:> bottom-sheet-raw props] children)) + (into [bottom-sheet-adapted props] children))