@xleddyl/443-components-native 0.6.0 → 0.7.0

package/lib/module/hooks/useSlidingIndicator.js

@@ -1,8 +1,13 @@
 "use strict";
 
 import { useEffect, useState } from 'react';
-import { useAnimatedStyle, useReducedMotion, useSharedValue, withSpring, withTiming } from 'react-native-reanimated';
+import { Gesture } from 'react-native-gesture-handler';
+import { Extrapolation, interpolate, useAnimatedStyle, useReducedMotion, useSharedValue, withSpring, withTiming } from 'react-native-reanimated';
 import { useUnistyles } from 'react-native-unistyles';
+import { scheduleOnRN } from 'react-native-worklets';
+import { triggerHaptic } from "../theme/settings.js";
+const holdDelay = 220;
+const liftScale = 1.06;
 export const useItemLayouts = () => {
   const [layouts, setLayouts] = useState({});
   const onItemLayout = (key, event) => {
@@ -20,42 +25,168 @@ export const useItemLayouts = () => {
   };
   return [layouts, onItemLayout];
 };
-export const useSlidingIndicator = (layout, offsetX = 0) => {
+const sampleAt = (position, values) => {
+  'worklet';
+
+  if (values.length < 2) {
+    return values[0] ?? 0;
+  }
+  return interpolate(position, values.map((_, index) => index), values, Extrapolation.CLAMP);
+};
+export const liftScaleAt = lift => {
+  'worklet';
+
+  return 1 + (liftScale - 1) * lift;
+};
+const measuredLayouts = layouts => layouts.length > 0 && layouts.every(Boolean) ? layouts : undefined;
+export const useIndicatorDrag = ({
+  position,
+  layouts,
+  index,
+  enabled = true,
+  selectable,
+  haptic = 'selection',
+  onSelect
+}) => {
+  const {
+    theme
+  } = useUnistyles();
+  const reducedMotion = useReducedMotion();
+  const dragging = useSharedValue(false);
+  const offset = useSharedValue(0);
+  const lift = useSharedValue(0);
+  const hovered = useSharedValue(index);
+  const follow = theme.motion.spring.press;
+  const settle = theme.motion.spring.gentle;
+  const count = layouts?.length ?? 0;
+  const centers = layouts?.map(layout => layout.x + layout.width / 2) ?? [];
+  const choices = layouts?.map((_, choice) => selectable?.[choice] !== false) ?? [];
+  const positionAt = x => {
+    'worklet';
+
+    if (centers.length < 2) {
+      return 0;
+    }
+    return interpolate(x, centers, centers.map((_, choice) => choice), Extrapolation.CLAMP);
+  };
+  const followTo = target => {
+    'worklet';
+
+    const next = target - position.value;
+    offset.value = reducedMotion ? next : withSpring(next, follow);
+  };
+  const release = target => {
+    if (target !== index) {
+      onSelect(target);
+    }
+  };
+  const gesture = Gesture.Pan().enabled(enabled && count > 1).activateAfterLongPress(holdDelay).onStart(event => {
+    const target = positionAt(event.x);
+    dragging.value = true;
+    hovered.value = Math.round(target);
+    lift.value = reducedMotion ? 1 : withSpring(1, follow);
+    followTo(target);
+    scheduleOnRN(triggerHaptic, haptic);
+  }).onUpdate(event => {
+    const target = positionAt(event.x);
+    followTo(target);
+    const nearest = Math.round(target);
+    if (nearest !== hovered.value) {
+      hovered.value = nearest;
+      scheduleOnRN(triggerHaptic, haptic);
+    }
+  }).onFinalize(() => {
+    if (!dragging.value) {
+      return;
+    }
+    dragging.value = false;
+    const nearest = hovered.value;
+    const target = choices[nearest] ? nearest : index;
+    if (reducedMotion) {
+      lift.value = 0;
+      offset.value = 0;
+      position.value = target;
+    } else {
+      lift.value = withSpring(0, settle);
+      offset.value = withSpring(0, settle);
+      position.value = withSpring(target, settle);
+    }
+    scheduleOnRN(release, target);
+  });
+  return {
+    gesture,
+    dragging,
+    offset,
+    lift
+  };
+};
+export const useSlidingIndicator = ({
+  layouts,
+  index,
+  offsetX = 0,
+  insetX = 0,
+  draggable = true,
+  selectable,
+  haptic,
+  onSelect
+}) => {
   const {
     theme
   } = useUnistyles();
   const reducedMotion = useReducedMotion();
-  const x = useSharedValue(0);
-  const width = useSharedValue(0);
+  const position = useSharedValue(Math.max(index, 0));
   const opacity = useSharedValue(0);
-  const targetX = layout ? layout.x + offsetX : undefined;
-  const targetWidth = layout?.width;
+  const measured = measuredLayouts(layouts);
+  const visible = measured !== undefined && index >= 0 && index < measured.length;
   const spring = theme.motion.spring.gentle;
   const fadeDuration = theme.motion.duration.fast;
+  const offsets = measured?.map(layout => layout.x + offsetX + insetX) ?? [];
+  const widths = measured?.map(layout => Math.max(0, layout.width - insetX * 2)) ?? [];
+  const drag = useIndicatorDrag({
+    position,
+    layouts: measured,
+    index,
+    enabled: draggable && visible,
+    selectable,
+    haptic,
+    onSelect
+  });
+  const {
+    dragging,
+    offset,
+    lift
+  } = drag;
   useEffect(() => {
-    if (targetX === undefined || !targetWidth) {
+    if (!visible) {
       opacity.value = withTiming(0, {
         duration: fadeDuration
       });
       return;
     }
+    if (dragging.value) {
+      return;
+    }
     if (reducedMotion || opacity.value === 0) {
-      x.value = targetX;
-      width.value = targetWidth;
+      position.value = index;
     } else {
-      x.value = withSpring(targetX, spring);
-      width.value = withSpring(targetWidth, spring);
+      position.value = withSpring(index, spring);
     }
     opacity.value = withTiming(1, {
       duration: fadeDuration
     });
-  }, [targetX, targetWidth, reducedMotion, spring, fadeDuration, x, width, opacity]);
-  return useAnimatedStyle(() => ({
+  }, [index, visible, reducedMotion, spring, fadeDuration, position, opacity, dragging]);
+  const style = useAnimatedStyle(() => ({
     opacity: opacity.value,
-    width: width.value,
+    width: sampleAt(position.value + offset.value, widths),
     transform: [{
-      translateX: x.value
+      translateX: sampleAt(position.value + offset.value, offsets)
+    }, {
+      scale: liftScaleAt(lift.value)
     }]
   }));
+  return {
+    style,
+    gesture: drag.gesture
+  };
 };
 //# sourceMappingURL=useSlidingIndicator.js.map

package/lib/module/hooks/useSlidingIndicator.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useState","useAnimatedStyle","useReducedMotion","useSharedValue","withSpring","withTiming","useUnistyles","useItemLayouts","layouts","setLayouts","onItemLayout","key","event","x","width","nativeEvent","layout","current","useSlidingIndicator","offsetX","theme","reducedMotion","opacity","targetX","undefined","targetWidth","spring","motion","gentle","fadeDuration","duration","fast","value","transform","translateX"],"sourceRoot":"../../../src","sources":["hooks/useSlidingIndicator.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAE3C,SACGC,gBAAgB,EAChBC,gBAAgB,EAChBC,cAAc,EACdC,UAAU,EACVC,UAAU,QACN,yBAAyB;AAChC,SAASC,YAAY,QAAQ,wBAAwB;AAIrD,OAAO,MAAMC,cAAc,GAAGA,CAAA,KAAM;EACjC,MAAM,CAACC,OAAO,EAAEC,UAAU,CAAC,GAAGT,QAAQ,CAA6B,CAAC,CAAC,CAAC;EAEtE,MAAMU,YAAY,GAAGA,CAACC,GAAW,EAAEC,KAAwB,KAAK;IAC7D,MAAM;MAAEC,CAAC;MAAEC;IAAM,CAAC,GAAGF,KAAK,CAACG,WAAW,CAACC,MAAM;IAC7CP,UAAU,CAAEQ,OAAO,IAChBA,OAAO,CAACN,GAAG,CAAC,EAAEE,CAAC,KAAKA,CAAC,IAAII,OAAO,CAACN,GAAG,CAAC,EAAEG,KAAK,KAAKA,KAAK,GACjDG,OAAO,GACP;MAAE,GAAGA,OAAO;MAAE,CAACN,GAAG,GAAG;QAAEE,CAAC;QAAEC;MAAM;IAAE,CAC1C,CAAC;EACJ,CAAC;EAED,OAAO,CAACN,OAAO,EAAEE,YAAY,CAAC;AACjC,CAAC;AAED,OAAO,MAAMQ,mBAAmB,GAAGA,CAACF,MAA8B,EAAEG,OAAO,GAAG,CAAC,KAAK;EACjF,MAAM;IAAEC;EAAM,CAAC,GAAGd,YAAY,CAAC,CAAC;EAChC,MAAMe,aAAa,GAAGnB,gBAAgB,CAAC,CAAC;EACxC,MAAMW,CAAC,GAAGV,cAAc,CAAC,CAAC,CAAC;EAC3B,MAAMW,KAAK,GAAGX,cAAc,CAAC,CAAC,CAAC;EAC/B,MAAMmB,OAAO,GAAGnB,cAAc,CAAC,CAAC,CAAC;EACjC,MAAMoB,OAAO,GAAGP,MAAM,GAAGA,MAAM,CAACH,CAAC,GAAGM,OAAO,GAAGK,SAAS;EACvD,MAAMC,WAAW,GAAGT,MAAM,EAAEF,KAAK;EACjC,MAAMY,MAAM,GAAGN,KAAK,CAACO,MAAM,CAACD,MAAM,CAACE,MAAM;EACzC,MAAMC,YAAY,GAAGT,KAAK,CAACO,MAAM,CAACG,QAAQ,CAACC,IAAI;EAE/ChC,SAAS,CAAC,MAAM;IACb,IAAIwB,OAAO,KAAKC,SAAS,IAAI,CAACC,WAAW,EAAE;MACxCH,OAAO,CAACU,KAAK,GAAG3B,UAAU,CAAC,CAAC,EAAE;QAAEyB,QAAQ,EAAED;MAAa,CAAC,CAAC;MACzD;IACH;IACA,IAAIR,aAAa,IAAIC,OAAO,CAACU,KAAK,KAAK,CAAC,EAAE;MACvCnB,CAAC,CAACmB,KAAK,GAAGT,OAAO;MACjBT,KAAK,CAACkB,KAAK,GAAGP,WAAW;IAC5B,CAAC,MAAM;MACJZ,CAAC,CAACmB,KAAK,GAAG5B,UAAU,CAACmB,OAAO,EAAEG,MAAM,CAAC;MACrCZ,KAAK,CAACkB,KAAK,GAAG5B,UAAU,CAACqB,WAAW,EAAEC,MAAM,CAAC;IAChD;IACAJ,OAAO,CAACU,KAAK,GAAG3B,UAAU,CAAC,CAAC,EAAE;MAAEyB,QAAQ,EAAED;IAAa,CAAC,CAAC;EAC5D,CAAC,EAAE,CAACN,OAAO,EAAEE,WAAW,EAAEJ,aAAa,EAAEK,MAAM,EAAEG,YAAY,EAAEhB,CAAC,EAAEC,KAAK,EAAEQ,OAAO,CAAC,CAAC;EAElF,OAAOrB,gBAAgB,CAAC,OAAO;IAC5BqB,OAAO,EAAEA,OAAO,CAACU,KAAK;IACtBlB,KAAK,EAAEA,KAAK,CAACkB,KAAK;IAClBC,SAAS,EAAE,CAAC;MAAEC,UAAU,EAAErB,CAAC,CAACmB;IAAM,CAAC;EACtC,CAAC,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
+{"version":3,"names":["useEffect","useState","Gesture","Extrapolation","interpolate","useAnimatedStyle","useReducedMotion","useSharedValue","withSpring","withTiming","useUnistyles","scheduleOnRN","triggerHaptic","holdDelay","liftScale","useItemLayouts","layouts","setLayouts","onItemLayout","key","event","x","width","nativeEvent","layout","current","sampleAt","position","values","length","map","_","index","CLAMP","liftScaleAt","lift","measuredLayouts","every","Boolean","undefined","useIndicatorDrag","enabled","selectable","haptic","onSelect","theme","reducedMotion","dragging","offset","hovered","follow","motion","spring","press","settle","gentle","count","centers","choices","choice","positionAt","followTo","target","next","value","release","gesture","Pan","activateAfterLongPress","onStart","Math","round","onUpdate","nearest","onFinalize","useSlidingIndicator","offsetX","insetX","draggable","max","opacity","measured","visible","fadeDuration","duration","fast","offsets","widths","drag","style","transform","translateX","scale"],"sourceRoot":"../../../src","sources":["hooks/useSlidingIndicator.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAE3C,SAASC,OAAO,QAAQ,8BAA8B;AACtD,SACGC,aAAa,EACbC,WAAW,EACXC,gBAAgB,EAChBC,gBAAgB,EAChBC,cAAc,EACdC,UAAU,EACVC,UAAU,QACN,yBAAyB;AAEhC,SAASC,YAAY,QAAQ,wBAAwB;AACrD,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SAASC,aAAa,QAAQ,sBAAmB;AAKjD,MAAMC,SAAS,GAAG,GAAG;AACrB,MAAMC,SAAS,GAAG,IAAI;AAEtB,OAAO,MAAMC,cAAc,GAAGA,CAAA,KAAM;EACjC,MAAM,CAACC,OAAO,EAAEC,UAAU,CAAC,GAAGhB,QAAQ,CAA6B,CAAC,CAAC,CAAC;EAEtE,MAAMiB,YAAY,GAAGA,CAACC,GAAW,EAAEC,KAAwB,KAAK;IAC7D,MAAM;MAAEC,CAAC;MAAEC;IAAM,CAAC,GAAGF,KAAK,CAACG,WAAW,CAACC,MAAM;IAC7CP,UAAU,CAAEQ,OAAO,IAChBA,OAAO,CAACN,GAAG,CAAC,EAAEE,CAAC,KAAKA,CAAC,IAAII,OAAO,CAACN,GAAG,CAAC,EAAEG,KAAK,KAAKA,KAAK,GACjDG,OAAO,GACP;MAAE,GAAGA,OAAO;MAAE,CAACN,GAAG,GAAG;QAAEE,CAAC;QAAEC;MAAM;IAAE,CAC1C,CAAC;EACJ,CAAC;EAED,OAAO,CAACN,OAAO,EAAEE,YAAY,CAAC;AACjC,CAAC;AAED,MAAMQ,QAAQ,GAAGA,CAACC,QAAgB,EAAEC,MAAgB,KAAK;EACtD,SAAS;;EACT,IAAIA,MAAM,CAACC,MAAM,GAAG,CAAC,EAAE;IACpB,OAAOD,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;EACxB;EACA,OAAOxB,WAAW,CACfuB,QAAQ,EACRC,MAAM,CAACE,GAAG,CAAC,CAACC,CAAC,EAAEC,KAAK,KAAKA,KAAK,CAAC,EAC/BJ,MAAM,EACNzB,aAAa,CAAC8B,KACjB,CAAC;AACJ,CAAC;AAED,OAAO,MAAMC,WAAW,GAAIC,IAAY,IAAK;EAC1C,SAAS;;EACT,OAAO,CAAC,GAAG,CAACrB,SAAS,GAAG,CAAC,IAAIqB,IAAI;AACpC,CAAC;AAED,MAAMC,eAAe,GAAIpB,OAAmC,IACzDA,OAAO,CAACa,MAAM,GAAG,CAAC,IAAIb,OAAO,CAACqB,KAAK,CAACC,OAAO,CAAC,GAAItB,OAAO,GAAoBuB,SAAS;AAYvF,OAAO,MAAMC,gBAAgB,GAAGA,CAAC;EAC9Bb,QAAQ;EACRX,OAAO;EACPgB,KAAK;EACLS,OAAO,GAAG,IAAI;EACdC,UAAU;EACVC,MAAM,GAAG,WAAW;EACpBC;AACmB,CAAC,KAAK;EACzB,MAAM;IAAEC;EAAM,CAAC,GAAGnC,YAAY,CAAC,CAAC;EAChC,MAAMoC,aAAa,GAAGxC,gBAAgB,CAAC,CAAC;EACxC,MAAMyC,QAAQ,GAAGxC,cAAc,CAAC,KAAK,CAAC;EACtC,MAAMyC,MAAM,GAAGzC,cAAc,CAAC,CAAC,CAAC;EAChC,MAAM4B,IAAI,GAAG5B,cAAc,CAAC,CAAC,CAAC;EAC9B,MAAM0C,OAAO,GAAG1C,cAAc,CAACyB,KAAK,CAAC;EACrC,MAAMkB,MAAM,GAAGL,KAAK,CAACM,MAAM,CAACC,MAAM,CAACC,KAAK;EACxC,MAAMC,MAAM,GAAGT,KAAK,CAACM,MAAM,CAACC,MAAM,CAACG,MAAM;EACzC,MAAMC,KAAK,GAAGxC,OAAO,EAAEa,MAAM,IAAI,CAAC;EAClC,MAAM4B,OAAO,GAAGzC,OAAO,EAAEc,GAAG,CAAEN,MAAM,IAAKA,MAAM,CAACH,CAAC,GAAGG,MAAM,CAACF,KAAK,GAAG,CAAC,CAAC,IAAI,EAAE;EAC3E,MAAMoC,OAAO,GAAG1C,OAAO,EAAEc,GAAG,CAAC,CAACC,CAAC,EAAE4B,MAAM,KAAKjB,UAAU,GAAGiB,MAAM,CAAC,KAAK,KAAK,CAAC,IAAI,EAAE;EAEjF,MAAMC,UAAU,GAAIvC,CAAS,IAAK;IAC/B,SAAS;;IACT,IAAIoC,OAAO,CAAC5B,MAAM,GAAG,CAAC,EAAE;MACrB,OAAO,CAAC;IACX;IACA,OAAOzB,WAAW,CACfiB,CAAC,EACDoC,OAAO,EACPA,OAAO,CAAC3B,GAAG,CAAC,CAACC,CAAC,EAAE4B,MAAM,KAAKA,MAAM,CAAC,EAClCxD,aAAa,CAAC8B,KACjB,CAAC;EACJ,CAAC;EAED,MAAM4B,QAAQ,GAAIC,MAAc,IAAK;IAClC,SAAS;;IACT,MAAMC,IAAI,GAAGD,MAAM,GAAGnC,QAAQ,CAACqC,KAAK;IACpChB,MAAM,CAACgB,KAAK,GAAGlB,aAAa,GAAGiB,IAAI,GAAGvD,UAAU,CAACuD,IAAI,EAAEb,MAAM,CAAC;EACjE,CAAC;EAED,MAAMe,OAAO,GAAIH,MAAc,IAAK;IACjC,IAAIA,MAAM,KAAK9B,KAAK,EAAE;MACnBY,QAAQ,CAACkB,MAAM,CAAC;IACnB;EACH,CAAC;EAED,MAAMI,OAAO,GAAGhE,OAAO,CAACiE,GAAG,CAAC,CAAC,CACzB1B,OAAO,CAACA,OAAO,IAAIe,KAAK,GAAG,CAAC,CAAC,CAC7BY,sBAAsB,CAACvD,SAAS,CAAC,CACjCwD,OAAO,CAAEjD,KAAK,IAAK;IACjB,MAAM0C,MAAM,GAAGF,UAAU,CAACxC,KAAK,CAACC,CAAC,CAAC;IAClC0B,QAAQ,CAACiB,KAAK,GAAG,IAAI;IACrBf,OAAO,CAACe,KAAK,GAAGM,IAAI,CAACC,KAAK,CAACT,MAAM,CAAC;IAClC3B,IAAI,CAAC6B,KAAK,GAAGlB,aAAa,GAAG,CAAC,GAAGtC,UAAU,CAAC,CAAC,EAAE0C,MAAM,CAAC;IACtDW,QAAQ,CAACC,MAAM,CAAC;IAChBnD,YAAY,CAACC,aAAa,EAAE+B,MAAM,CAAC;EACtC,CAAC,CAAC,CACD6B,QAAQ,CAAEpD,KAAK,IAAK;IAClB,MAAM0C,MAAM,GAAGF,UAAU,CAACxC,KAAK,CAACC,CAAC,CAAC;IAClCwC,QAAQ,CAACC,MAAM,CAAC;IAChB,MAAMW,OAAO,GAAGH,IAAI,CAACC,KAAK,CAACT,MAAM,CAAC;IAClC,IAAIW,OAAO,KAAKxB,OAAO,CAACe,KAAK,EAAE;MAC5Bf,OAAO,CAACe,KAAK,GAAGS,OAAO;MACvB9D,YAAY,CAACC,aAAa,EAAE+B,MAAM,CAAC;IACtC;EACH,CAAC,CAAC,CACD+B,UAAU,CAAC,MAAM;IACf,IAAI,CAAC3B,QAAQ,CAACiB,KAAK,EAAE;MAClB;IACH;IACAjB,QAAQ,CAACiB,KAAK,GAAG,KAAK;IACtB,MAAMS,OAAO,GAAGxB,OAAO,CAACe,KAAK;IAC7B,MAAMF,MAAM,GAAGJ,OAAO,CAACe,OAAO,CAAC,GAAGA,OAAO,GAAGzC,KAAK;IACjD,IAAIc,aAAa,EAAE;MAChBX,IAAI,CAAC6B,KAAK,GAAG,CAAC;MACdhB,MAAM,CAACgB,KAAK,GAAG,CAAC;MAChBrC,QAAQ,CAACqC,KAAK,GAAGF,MAAM;IAC1B,CAAC,MAAM;MACJ3B,IAAI,CAAC6B,KAAK,GAAGxD,UAAU,CAAC,CAAC,EAAE8C,MAAM,CAAC;MAClCN,MAAM,CAACgB,KAAK,GAAGxD,UAAU,CAAC,CAAC,EAAE8C,MAAM,CAAC;MACpC3B,QAAQ,CAACqC,KAAK,GAAGxD,UAAU,CAACsD,MAAM,EAAER,MAAM,CAAC;IAC9C;IACA3C,YAAY,CAACsD,OAAO,EAAEH,MAAM,CAAC;EAChC,CAAC,CAAC;EAEL,OAAO;IAAEI,OAAO;IAAEnB,QAAQ;IAAEC,MAAM;IAAEb;EAAK,CAAC;AAC7C,CAAC;AAaD,OAAO,MAAMwC,mBAAmB,GAAGA,CAAC;EACjC3D,OAAO;EACPgB,KAAK;EACL4C,OAAO,GAAG,CAAC;EACXC,MAAM,GAAG,CAAC;EACVC,SAAS,GAAG,IAAI;EAChBpC,UAAU;EACVC,MAAM;EACNC;AACsB,CAAC,KAAK;EAC5B,MAAM;IAAEC;EAAM,CAAC,GAAGnC,YAAY,CAAC,CAAC;EAChC,MAAMoC,aAAa,GAAGxC,gBAAgB,CAAC,CAAC;EACxC,MAAMqB,QAAQ,GAAGpB,cAAc,CAAC+D,IAAI,CAACS,GAAG,CAAC/C,KAAK,EAAE,CAAC,CAAC,CAAC;EACnD,MAAMgD,OAAO,GAAGzE,cAAc,CAAC,CAAC,CAAC;EACjC,MAAM0E,QAAQ,GAAG7C,eAAe,CAACpB,OAAO,CAAC;EACzC,MAAMkE,OAAO,GAAGD,QAAQ,KAAK1C,SAAS,IAAIP,KAAK,IAAI,CAAC,IAAIA,KAAK,GAAGiD,QAAQ,CAACpD,MAAM;EAC/E,MAAMuB,MAAM,GAAGP,KAAK,CAACM,MAAM,CAACC,MAAM,CAACG,MAAM;EACzC,MAAM4B,YAAY,GAAGtC,KAAK,CAACM,MAAM,CAACiC,QAAQ,CAACC,IAAI;EAC/C,MAAMC,OAAO,GAAGL,QAAQ,EAAEnD,GAAG,CAAEN,MAAM,IAAKA,MAAM,CAACH,CAAC,GAAGuD,OAAO,GAAGC,MAAM,CAAC,IAAI,EAAE;EAC5E,MAAMU,MAAM,GAAGN,QAAQ,EAAEnD,GAAG,CAAEN,MAAM,IAAK8C,IAAI,CAACS,GAAG,CAAC,CAAC,EAAEvD,MAAM,CAACF,KAAK,GAAGuD,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE;EAEtF,MAAMW,IAAI,GAAGhD,gBAAgB,CAAC;IAC3Bb,QAAQ;IACRX,OAAO,EAAEiE,QAAQ;IACjBjD,KAAK;IACLS,OAAO,EAAEqC,SAAS,IAAII,OAAO;IAC7BxC,UAAU;IACVC,MAAM;IACNC;EACH,CAAC,CAAC;EACF,MAAM;IAAEG,QAAQ;IAAEC,MAAM;IAAEb;EAAK,CAAC,GAAGqD,IAAI;EAEvCxF,SAAS,CAAC,MAAM;IACb,IAAI,CAACkF,OAAO,EAAE;MACXF,OAAO,CAAChB,KAAK,GAAGvD,UAAU,CAAC,CAAC,EAAE;QAAE2E,QAAQ,EAAED;MAAa,CAAC,CAAC;MACzD;IACH;IACA,IAAIpC,QAAQ,CAACiB,KAAK,EAAE;MACjB;IACH;IACA,IAAIlB,aAAa,IAAIkC,OAAO,CAAChB,KAAK,KAAK,CAAC,EAAE;MACvCrC,QAAQ,CAACqC,KAAK,GAAGhC,KAAK;IACzB,CAAC,MAAM;MACJL,QAAQ,CAACqC,KAAK,GAAGxD,UAAU,CAACwB,KAAK,EAAEoB,MAAM,CAAC;IAC7C;IACA4B,OAAO,CAAChB,KAAK,GAAGvD,UAAU,CAAC,CAAC,EAAE;MAAE2E,QAAQ,EAAED;IAAa,CAAC,CAAC;EAC5D,CAAC,EAAE,CAACnD,KAAK,EAAEkD,OAAO,EAAEpC,aAAa,EAAEM,MAAM,EAAE+B,YAAY,EAAExD,QAAQ,EAAEqD,OAAO,EAAEjC,QAAQ,CAAC,CAAC;EAEtF,MAAM0C,KAAK,GAAGpF,gBAAgB,CAAC,OAAO;IACnC2E,OAAO,EAAEA,OAAO,CAAChB,KAAK;IACtB1C,KAAK,EAAEI,QAAQ,CAACC,QAAQ,CAACqC,KAAK,GAAGhB,MAAM,CAACgB,KAAK,EAAEuB,MAAM,CAAC;IACtDG,SAAS,EAAE,CACR;MAAEC,UAAU,EAAEjE,QAAQ,CAACC,QAAQ,CAACqC,KAAK,GAAGhB,MAAM,CAACgB,KAAK,EAAEsB,OAAO;IAAE,CAAC,EAChE;MAAEM,KAAK,EAAE1D,WAAW,CAACC,IAAI,CAAC6B,KAAK;IAAE,CAAC;EAExC,CAAC,CAAC,CAAC;EAEH,OAAO;IAAEyB,KAAK;IAAEvB,OAAO,EAAEsB,IAAI,CAACtB;EAAQ,CAAC;AAC1C,CAAC","ignoreList":[]}

package/lib/module/icons/heroicons.js

@@ -54,6 +54,7 @@ export const heroiconPaths = {
   'map-pin': ['M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z', 'M19.5 10.5c0 7.142-7.5 11.25-7.5 11.25S4.5 17.642 4.5 10.5a7.5 7.5 0 1 1 15 0Z'],
   map: ['M9 6.75V15m6-6v8.25m.503 3.498 4.875-2.437c.381-.19.622-.58.622-1.006V4.82c0-.836-.88-1.38-1.628-1.006l-3.869 1.934c-.317.159-.69.159-1.006 0L9.503 3.252a1.125 1.125 0 0 0-1.006 0L3.622 5.689C3.24 5.88 3 6.27 3 6.695V19.18c0 .836.88 1.38 1.628 1.006l3.869-1.934c.317-.159.69-.159 1.006 0l4.994 2.497c.317.158.69.158 1.006 0Z'],
   phone: ['M2.25 6.75c0 8.284 6.716 15 15 15h2.25a2.25 2.25 0 0 0 2.25-2.25v-1.372c0-.516-.351-.966-.852-1.091l-4.423-1.106c-.44-.11-.902.055-1.173.417l-.97 1.293c-.282.376-.769.542-1.21.38a12.035 12.035 0 0 1-7.143-7.143c-.162-.441.004-.928.38-1.21l1.293-.97c.363-.271.527-.734.417-1.173L6.963 3.102a1.125 1.125 0 0 0-1.091-.852H4.5A2.25 2.25 0 0 0 2.25 4.5v2.25Z'],
+  'device-phone': ['M10.5 1.5H8.25A2.25 2.25 0 0 0 6 3.75v16.5a2.25 2.25 0 0 0 2.25 2.25h7.5A2.25 2.25 0 0 0 18 20.25V3.75a2.25 2.25 0 0 0-2.25-2.25H13.5m-3 0V3h3V1.5m-3 0h3m-3 18.75h3'],
   chat: ['M2.25 12.76c0 1.6 1.123 2.994 2.707 3.227 1.087.16 2.185.283 3.293.369V21l4.076-4.076a1.526 1.526 0 0 1 1.037-.443 48.282 48.282 0 0 0 5.68-.494c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0 0 12 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018Z'],
   'qr-code': ['M3.75 4.875c0-.621.504-1.125 1.125-1.125h4.5c.621 0 1.125.504 1.125 1.125v4.5c0 .621-.504 1.125-1.125 1.125h-4.5A1.125 1.125 0 0 1 3.75 9.375v-4.5ZM3.75 14.625c0-.621.504-1.125 1.125-1.125h4.5c.621 0 1.125.504 1.125 1.125v4.5c0 .621-.504 1.125-1.125 1.125h-4.5a1.125 1.125 0 0 1-1.125-1.125v-4.5ZM13.5 4.875c0-.621.504-1.125 1.125-1.125h4.5c.621 0 1.125.504 1.125 1.125v4.5c0 .621-.504 1.125-1.125 1.125h-4.5A1.125 1.125 0 0 1 13.5 9.375v-4.5Z', 'M6.75 6.75h.75v.75h-.75v-.75ZM6.75 16.5h.75v.75h-.75v-.75ZM16.5 6.75h.75v.75h-.75v-.75ZM13.5 13.5h.75v.75h-.75v-.75ZM13.5 19.5h.75v.75h-.75v-.75ZM19.5 13.5h.75v.75h-.75v-.75ZM19.5 19.5h.75v.75h-.75v-.75ZM16.5 16.5h.75v.75h-.75v-.75Z'],
   key: ['M15.75 5.25a3 3 0 0 1 3 3m3 0a6 6 0 0 1-7.029 5.912c-.563-.097-1.159.026-1.563.43L10.5 17.25H8.25v2.25H6v2.25H2.25v-2.818c0-.597.237-1.17.659-1.591l6.499-6.499c.404-.404.527-1 .43-1.563A6 6 0 1 1 21.75 8.25Z'],

package/lib/module/icons/heroicons.js.map

@@ -1 +1 @@
-{"version":3,"names":["heroiconPaths","close","check","plus","minus","back","search","eye","alert","info","success","error","home","user","users","settings","bell","backspace","fingerprint","calendar","clock","trash","edit","share","more","filter","star","heart","lock","unlock","mail","image","camera","menu","logout","refresh","download","upload","copy","link","map","phone","chat","key","shield","globe","sun","moon","inbox","document","folder","grid","list"],"sourceRoot":"../../../src","sources":["icons/heroicons.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["heroiconPaths","close","check","plus","minus","back","search","eye","alert","info","success","error","home","user","users","settings","bell","backspace","fingerprint","calendar","clock","trash","edit","share","more","filter","star","heart","lock","unlock","mail","image","camera","menu","logout","refresh","download","upload","copy","link","map","phone","chat","key","shield","globe","sun","moon","inbox","document","folder","grid","list"],"sourceRoot":"../../../src","sources":["icons/heroicons.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/presets/default.js

@@ -1,173 +1,124 @@
 "use strict";
 
-import { definePreset } from "./definePreset.js";
-const shared = {
-  radius: {
-    xs: 6,
-    sm: 10,
-    md: 16,
-    lg: 24,
-    xl: 32
-  },
-  typography: {
-    variants: {
-      display: {
-        fontSize: 56,
-        lineHeight: 62,
-        letterSpacing: -1,
-        weight: 'bold'
-      },
-      title: {
-        fontSize: 28,
-        lineHeight: 34,
-        letterSpacing: -0.3,
-        weight: 'bold'
-      },
-      heading: {
-        fontSize: 20,
-        lineHeight: 26,
-        letterSpacing: -0.1,
-        weight: 'semibold'
-      },
-      body: {
-        fontSize: 16,
-        lineHeight: 22,
-        letterSpacing: 0,
-        weight: 'regular'
-      },
-      label: {
-        fontSize: 16,
-        lineHeight: 20,
-        letterSpacing: 0,
-        weight: 'semibold'
-      },
-      caption: {
-        fontSize: 14,
-        lineHeight: 18,
-        letterSpacing: 0,
-        weight: 'regular'
-      }
-    }
-  },
-  sizes: {
-    control: {
-      sm: 44,
-      md: 56,
-      lg: 64
-    },
-    icon: {
-      sm: 18,
-      md: 22,
-      lg: 26
-    },
-    minTouchTarget: 48
-  },
-  components: {
-    button: {
-      radius: 16,
-      height: {
-        sm: 44,
-        md: 56,
-        lg: 64
-      },
-      labelWeight: 'semibold'
-    },
-    iconButton: {
-      radius: 16
+import { definePreset, mergeThemeInputs } from "./definePreset.js";
+import { geistType } from "./funnel.js";
+export const defaultPreset = definePreset({
+  name: 'default',
+  label: 'Default',
+  description: 'Indigo accent on quiet neutral surfaces, Geist, the web default',
+  shared: mergeThemeInputs(geistType, {
+    radius: {
+      xs: 4,
+      sm: 6,
+      md: 8,
+      lg: 12,
+      xl: 16
     },
-    textField: {
-      radius: 10,
-      height: {
-        sm: 44,
-        md: 56,
-        lg: 64
+    typography: {
+      variants: {
+        display: {
+          fontSize: 28,
+          lineHeight: 34,
+          letterSpacing: -0.6,
+          weight: 'semibold'
+        },
+        title: {
+          fontSize: 22,
+          lineHeight: 28,
+          letterSpacing: -0.4,
+          weight: 'semibold'
+        },
+        heading: {
+          fontSize: 18,
+          lineHeight: 24,
+          letterSpacing: -0.2,
+          weight: 'semibold'
+        }
       }
     },
-    card: {
-      radius: 16,
-      padding: 16
-    },
-    sheet: {
-      radius: 24
+    components: {
+      card: {
+        radius: 12
+      }
     }
-  }
-};
-export const defaultPreset = definePreset({
-  name: 'default',
-  label: 'Default',
-  description: 'Clear blue accent on a cool light surface, system font, large touch targets',
-  shared,
+  }),
   light: {
     colors: {
-      background: '#F4F8FC',
+      background: '#F5F5F6',
       surface: '#FFFFFF',
       surfaceRaised: '#FFFFFF',
-      surfaceSunken: '#EAF1F9',
-      border: '#DCE6F2',
-      borderStrong: '#B9CBE0',
-      text: '#0F2A4A',
-      textMuted: '#5B7391',
-      textDimmed: '#8299B3',
-      primary: '#1D6FE0',
-      primarySoft: '#E3EEFC',
+      surfaceSunken: '#EFEFF1',
+      border: '#E7E7EA',
+      borderStrong: '#D8D8DD',
+      text: '#111114',
+      textMuted: '#6B6B75',
+      textDimmed: '#85858E',
+      primary: '#5B5BD6',
+      primarySoft: '#EDEDFA',
       onPrimary: '#FFFFFF',
-      secondary: '#0F2A4A',
-      secondarySoft: '#E8EEF5',
+      primaryText: '#5252C1',
+      secondary: '#3B3B42',
+      secondarySoft: '#EFEFF1',
       onSecondary: '#FFFFFF',
-      neutral: '#0F2A4A',
-      neutralSoft: '#E8EEF5',
+      neutral: '#111114',
+      neutralSoft: '#EFEFF1',
       onNeutral: '#FFFFFF',
-      danger: '#D93B3B',
-      dangerSoft: '#FCE8E8',
+      danger: '#D9383A',
+      dangerSoft: '#F9E7E7',
       onDanger: '#FFFFFF',
-      success: '#1E9E62',
-      successSoft: '#E2F5EC',
+      dangerText: '#B22E30',
+      success: '#1A7F4D',
+      successSoft: '#E6F2EC',
       onSuccess: '#FFFFFF',
-      warning: '#C77700',
-      warningSoft: '#FFF3DD',
+      successText: '#187145',
+      warning: '#A85A08',
+      warningSoft: '#F7EDE2',
       onWarning: '#FFFFFF',
-      info: '#1D6FE0',
-      infoSoft: '#E3EEFC',
+      warningText: '#945009',
+      info: '#2F6FD6',
+      infoSoft: '#E8F0FB',
       onInfo: '#FFFFFF',
-      overlay: 'rgba(15, 42, 74, 0.4)',
-      focus: '#1D6FE0'
+      infoText: '#285FB8',
+      overlay: 'rgba(22, 22, 30, 0.28)',
+      focus: '#5252C1'
     }
   },
   dark: {
     colors: {
-      background: '#08121F',
-      surface: '#0F1D2E',
-      surfaceRaised: '#15263A',
-      surfaceSunken: '#050C15',
-      border: '#203550',
-      borderStrong: '#2F4A6B',
-      text: '#E6EEF8',
-      textMuted: '#9FB3CB',
-      textDimmed: '#6D83A0',
-      primary: '#2F7BEA',
-      primarySoft: '#13294A',
+      background: '#0D0D0F',
+      surface: '#141416',
+      surfaceRaised: '#2A2A30',
+      surfaceSunken: '#222226',
+      border: '#232327',
+      borderStrong: '#303036',
+      text: '#F2F2F3',
+      textMuted: '#9B9BA5',
+      textDimmed: '#6E6E78',
+      primary: '#6466E9',
+      primarySoft: '#1F1F33',
       onPrimary: '#FFFFFF',
-      primaryText: '#7DB0F7',
-      secondary: '#E6EEF8',
-      secondarySoft: '#1A2B40',
-      onSecondary: '#08121F',
-      neutral: '#E6EEF8',
-      neutralSoft: '#1A2B40',
-      onNeutral: '#08121F',
-      danger: '#FF7070',
-      dangerSoft: '#3A1418',
-      onDanger: '#1A0507',
-      success: '#3DCB8A',
-      successSoft: '#0F2E21',
-      onSuccess: '#05190F',
-      warning: '#FFB547',
-      warningSoft: '#352408',
-      onWarning: '#1F1300',
-      info: '#7DB0F7',
-      infoSoft: '#13294A',
-      onInfo: '#08121F',
-      overlay: 'rgba(0, 0, 0, 0.6)',
-      focus: '#7DB0F7'
+      primaryText: '#AAABF3',
+      secondary: '#CDCDD3',
+      secondarySoft: '#222226',
+      onSecondary: '#111114',
+      neutral: '#F2F2F3',
+      neutralSoft: '#222226',
+      onNeutral: '#111114',
+      danger: '#F47A7A',
+      dangerSoft: '#2C1F1F',
+      onDanger: '#1A0B0C',
+      dangerText: '#F58787',
+      success: '#5CCF90',
+      successSoft: '#1C291F',
+      onSuccess: '#0B1A12',
+      warning: '#EFB255',
+      warningSoft: '#2C251D',
+      onWarning: '#2A1F00',
+      info: '#7AA8F4',
+      infoSoft: '#1F242E',
+      onInfo: '#0B1625',
+      overlay: 'rgba(0, 0, 0, 0.55)',
+      focus: '#9394F0'
     }
   }
 });

package/lib/module/presets/default.js.map

@@ -1 +1 @@
-{"version":3,"names":["definePreset","shared","radius","xs","sm","md","lg","xl","typography","variants","display","fontSize","lineHeight","letterSpacing","weight","title","heading","body","label","caption","sizes","control","icon","minTouchTarget","components","button","height","labelWeight","iconButton","textField","card","padding","sheet","defaultPreset","name","description","light","colors","background","surface","surfaceRaised","surfaceSunken","border","borderStrong","text","textMuted","textDimmed","primary","primarySoft","onPrimary","secondary","secondarySoft","onSecondary","neutral","neutralSoft","onNeutral","danger","dangerSoft","onDanger","success","successSoft","onSuccess","warning","warningSoft","onWarning","info","infoSoft","onInfo","overlay","focus","dark","primaryText"],"sourceRoot":"../../../src","sources":["presets/default.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["definePreset","mergeThemeInputs","geistType","defaultPreset","name","label","description","shared","radius","xs","sm","md","lg","xl","typography","variants","display","fontSize","lineHeight","letterSpacing","weight","title","heading","components","card","light","colors","background","surface","surfaceRaised","surfaceSunken","border","borderStrong","text","textMuted","textDimmed","primary","primarySoft","onPrimary","primaryText","secondary","secondarySoft","onSecondary","neutral","neutralSoft","onNeutral","danger","dangerSoft","onDanger","dangerText","success","successSoft","onSuccess","successText","warning","warningSoft","onWarning","warningText","info","infoSoft","onInfo","infoText","overlay","focus","dark"],"sourceRoot":"../../../src","sources":["presets/default.ts"],"mappings":";;AAAA,SAASA,YAAY,EAAEC,gBAAgB,QAAQ,mBAAgB;AAC/D,SAASC,SAAS,QAAQ,aAAU;AAEpC,OAAO,MAAMC,aAAa,GAAGH,YAAY,CAAC;EACvCI,IAAI,EAAE,SAAS;EACfC,KAAK,EAAE,SAAS;EAChBC,WAAW,EAAE,iEAAiE;EAC9EC,MAAM,EAAEN,gBAAgB,CAACC,SAAS,EAAE;IACjCM,MAAM,EAAE;MAAEC,EAAE,EAAE,CAAC;MAAEC,EAAE,EAAE,CAAC;MAAEC,EAAE,EAAE,CAAC;MAAEC,EAAE,EAAE,EAAE;MAAEC,EAAE,EAAE;IAAG,CAAC;IAC/CC,UAAU,EAAE;MACTC,QAAQ,EAAE;QACPC,OAAO,EAAE;UAAEC,QAAQ,EAAE,EAAE;UAAEC,UAAU,EAAE,EAAE;UAAEC,aAAa,EAAE,CAAC,GAAG;UAAEC,MAAM,EAAE;QAAW,CAAC;QAClFC,KAAK,EAAE;UAAEJ,QAAQ,EAAE,EAAE;UAAEC,UAAU,EAAE,EAAE;UAAEC,aAAa,EAAE,CAAC,GAAG;UAAEC,MAAM,EAAE;QAAW,CAAC;QAChFE,OAAO,EAAE;UAAEL,QAAQ,EAAE,EAAE;UAAEC,UAAU,EAAE,EAAE;UAAEC,aAAa,EAAE,CAAC,GAAG;UAAEC,MAAM,EAAE;QAAW;MACpF;IACH,CAAC;IACDG,UAAU,EAAE;MAAEC,IAAI,EAAE;QAAEhB,MAAM,EAAE;MAAG;IAAE;EACtC,CAAC,CAAC;EACFiB,KAAK,EAAE;IACJC,MAAM,EAAE;MACLC,UAAU,EAAE,SAAS;MACrBC,OAAO,EAAE,SAAS;MAClBC,aAAa,EAAE,SAAS;MACxBC,aAAa,EAAE,SAAS;MACxBC,MAAM,EAAE,SAAS;MACjBC,YAAY,EAAE,SAAS;MACvBC,IAAI,EAAE,SAAS;MACfC,SAAS,EAAE,SAAS;MACpBC,UAAU,EAAE,SAAS;MACrBC,OAAO,EAAE,SAAS;MAClBC,WAAW,EAAE,SAAS;MACtBC,SAAS,EAAE,SAAS;MACpBC,WAAW,EAAE,SAAS;MACtBC,SAAS,EAAE,SAAS;MACpBC,aAAa,EAAE,SAAS;MACxBC,WAAW,EAAE,SAAS;MACtBC,OAAO,EAAE,SAAS;MAClBC,WAAW,EAAE,SAAS;MACtBC,SAAS,EAAE,SAAS;MACpBC,MAAM,EAAE,SAAS;MACjBC,UAAU,EAAE,SAAS;MACrBC,QAAQ,EAAE,SAAS;MACnBC,UAAU,EAAE,SAAS;MACrBC,OAAO,EAAE,SAAS;MAClBC,WAAW,EAAE,SAAS;MACtBC,SAAS,EAAE,SAAS;MACpBC,WAAW,EAAE,SAAS;MACtBC,OAAO,EAAE,SAAS;MAClBC,WAAW,EAAE,SAAS;MACtBC,SAAS,EAAE,SAAS;MACpBC,WAAW,EAAE,SAAS;MACtBC,IAAI,EAAE,SAAS;MACfC,QAAQ,EAAE,SAAS;MACnBC,MAAM,EAAE,SAAS;MACjBC,QAAQ,EAAE,SAAS;MACnBC,OAAO,EAAE,wBAAwB;MACjCC,KAAK,EAAE;IACV;EACH,CAAC;EACDC,IAAI,EAAE;IACHtC,MAAM,EAAE;MACLC,UAAU,EAAE,SAAS;MACrBC,OAAO,EAAE,SAAS;MAClBC,aAAa,EAAE,SAAS;MACxBC,aAAa,EAAE,SAAS;MACxBC,MAAM,EAAE,SAAS;MACjBC,YAAY,EAAE,SAAS;MACvBC,IAAI,EAAE,SAAS;MACfC,SAAS,EAAE,SAAS;MACpBC,UAAU,EAAE,SAAS;MACrBC,OAAO,EAAE,SAAS;MAClBC,WAAW,EAAE,SAAS;MACtBC,SAAS,EAAE,SAAS;MACpBC,WAAW,EAAE,SAAS;MACtBC,SAAS,EAAE,SAAS;MACpBC,aAAa,EAAE,SAAS;MACxBC,WAAW,EAAE,SAAS;MACtBC,OAAO,EAAE,SAAS;MAClBC,WAAW,EAAE,SAAS;MACtBC,SAAS,EAAE,SAAS;MACpBC,MAAM,EAAE,SAAS;MACjBC,UAAU,EAAE,SAAS;MACrBC,QAAQ,EAAE,SAAS;MACnBC,UAAU,EAAE,SAAS;MACrBC,OAAO,EAAE,SAAS;MAClBC,WAAW,EAAE,SAAS;MACtBC,SAAS,EAAE,SAAS;MACpBE,OAAO,EAAE,SAAS;MAClBC,WAAW,EAAE,SAAS;MACtBC,SAAS,EAAE,SAAS;MACpBE,IAAI,EAAE,SAAS;MACfC,QAAQ,EAAE,SAAS;MACnBC,MAAM,EAAE,SAAS;MACjBE,OAAO,EAAE,qBAAqB;MAC9BC,KAAK,EAAE;IACV;EACH;AACH,CAAC,CAAC","ignoreList":[]}

package/lib/module/presets/funnel.js

@@ -1,6 +1,10 @@
 "use strict";
 
 export const presetFontFamilies = {
+  geistRegular: 'Geist-Regular',
+  geistMedium: 'Geist-Medium',
+  geistSemiBold: 'Geist-SemiBold',
+  geistBold: 'Geist-Bold',
   funnelSansRegular: 'FunnelSans-Regular',
   funnelSansMedium: 'FunnelSans-Medium',
   funnelSansSemiBold: 'FunnelSans-SemiBold',
@@ -8,14 +12,17 @@ export const presetFontFamilies = {
   funnelDisplayBold: 'FunnelDisplay-Bold',
   unboundedSemiBold: 'Unbounded-SemiBold'
 };
-export const funnelCompact = {
-  radius: {
-    xs: 6,
-    sm: 8,
-    md: 10,
-    lg: 16,
-    xl: 24
-  },
+export const geistType = {
+  typography: {
+    fonts: {
+      regular: presetFontFamilies.geistRegular,
+      medium: presetFontFamilies.geistMedium,
+      semibold: presetFontFamilies.geistSemiBold,
+      bold: presetFontFamilies.geistBold
+    }
+  }
+};
+export const funnelType = {
   typography: {
     fonts: {
       regular: presetFontFamilies.funnelSansRegular,
@@ -25,16 +32,10 @@ export const funnelCompact = {
     },
     variants: {
       body: {
-        fontSize: 16,
-        lineHeight: 22,
-        letterSpacing: 0,
-        weight: 'medium'
-      },
-      label: {
         fontSize: 15,
-        lineHeight: 20,
+        lineHeight: 21,
         letterSpacing: 0,
-        weight: 'semibold'
+        weight: 'medium'
       },
       caption: {
         fontSize: 13,
@@ -43,41 +44,6 @@ export const funnelCompact = {
         weight: 'medium'
       }
     }
-  },
-  sizes: {
-    control: {
-      sm: 40,
-      md: 50,
-      lg: 56
-    }
-  },
-  components: {
-    button: {
-      radius: 10,
-      height: {
-        sm: 40,
-        md: 50,
-        lg: 56
-      },
-      labelWeight: 'semibold'
-    },
-    iconButton: {
-      radius: 10
-    },
-    textField: {
-      radius: 10,
-      height: {
-        sm: 40,
-        md: 50,
-        lg: 56
-      }
-    },
-    card: {
-      radius: 16
-    },
-    sheet: {
-      radius: 24
-    }
   }
 };
 //# sourceMappingURL=funnel.js.map