@mrmeg/expo-ui 0.13.0 → 0.15.0

package/dist/hooks/useTheme.js

@@ -42,7 +42,7 @@ function getCachedOrCompute(key, compute) {
  * - getTextColorForBackground("#000") → "light"
  * - getContrastingColor("#f4f4f4", "#222", "#fff") → "#222"
  * - withAlpha("#336699", 0.6) → "rgba(51,102,153,0.6)"
- * - getShadowStyle('base') → { boxShadow: "0px 1px 3px rgba(0, 0, 0, 0.1)" }
+ * - getShadowStyle('base') → { boxShadow: "0px 2px 6px rgba(0, 0, 0, 0.05), 0px 4px 12px rgba(0, 0, 0, 0.03)" }
  */
 export function useTheme() {
     const userTheme = useThemeStore((s) => s.userTheme);
@@ -100,29 +100,66 @@ export function useTheme() {
      * `boxShadow` has no separate opacity field, each preset's opacity is folded
      * into the color's alpha via `withAlpha`. `elevation` is dropped — `boxShadow`
      * renders shadows on Android in 0.85+.
+     *
+     * Every preset (except `sharp` and `glow`, which are deliberately
+     * single-layer) is a dual-layer shadow: a tight "contact" layer plus a
+     * wider, softer "ambient" layer, pitsi-ui-style. Layers are comma-joined
+     * into one `boxShadow` value.
      */
     const getShadowStyle = useCallback((type) => {
-        // Each preset: [offsetX, offsetY, blurRadius, color, opacity].
+        // Each preset is one or more layers of [offsetX, offsetY, blurRadius, color, opacity].
         // Darker themes get a stronger alpha so shadows stay visible.
         const boost = theme.dark ? 3 : 1;
         const overlay = theme.colors.overlay;
         const shadowConfigs = {
-            base: { x: 0, y: 1, blur: 3, color: overlay, opacity: 0.1 },
-            soft: { x: 0, y: 4, blur: 6, color: overlay, opacity: 0.1 },
-            sharp: { x: 0, y: 1, blur: 1, color: overlay, opacity: 0.15 },
-            subtle: { x: 0, y: 1, blur: 2, color: overlay, opacity: 0.05 },
-            elevated: { x: 0, y: 20, blur: 40, color: overlay, opacity: 0.15 },
-            glow: { x: 0, y: 4, blur: 20, color: theme.colors.primary, opacity: 0.4 },
-            glass: { x: 0, y: 4, blur: 30, color: overlay, opacity: 0.05 },
-            card: { x: 0, y: 2, blur: 8, color: overlay, opacity: 0.08 },
-            cardHover: { x: 0, y: 8, blur: 24, color: overlay, opacity: 0.12 },
-            cardSubtle: { x: 0, y: 1, blur: 3, color: overlay, opacity: 0.08 },
+            subtle: [
+                { x: 0, y: 1, blur: 3, color: overlay, opacity: 0.04 },
+                { x: 0, y: 2, blur: 8, color: overlay, opacity: 0.03 },
+            ],
+            base: [
+                { x: 0, y: 2, blur: 6, color: overlay, opacity: 0.05 },
+                { x: 0, y: 4, blur: 12, color: overlay, opacity: 0.03 },
+            ],
+            soft: [
+                { x: 0, y: 4, blur: 10, color: overlay, opacity: 0.05 },
+                { x: 0, y: 8, blur: 20, color: overlay, opacity: 0.03 },
+            ],
+            card: [
+                { x: 0, y: 4, blur: 12, color: overlay, opacity: 0.05 },
+                { x: 0, y: 8, blur: 24, color: overlay, opacity: 0.03 },
+            ],
+            cardSubtle: [
+                { x: 0, y: 1, blur: 3, color: overlay, opacity: 0.05 },
+                { x: 0, y: 3, blur: 9, color: overlay, opacity: 0.03 },
+            ],
+            cardHover: [
+                { x: 0, y: 8, blur: 24, color: overlay, opacity: 0.06 },
+                { x: 0, y: 16, blur: 48, color: overlay, opacity: 0.04 },
+            ],
+            elevated: [
+                { x: 0, y: 16, blur: 48, color: overlay, opacity: 0.08 },
+                { x: 0, y: 32, blur: 96, color: overlay, opacity: 0.05 },
+            ],
+            glass: [
+                { x: 0, y: 4, blur: 30, color: overlay, opacity: 0.05 },
+                { x: 0, y: 8, blur: 60, color: overlay, opacity: 0.03 },
+            ],
+            // Single layer — intentional crispness, not a soft dual-layer shadow.
+            sharp: [
+                { x: 0, y: 1, blur: 1, color: overlay, opacity: 0.15 },
+            ],
+            // Single layer — already a deliberate, vivid accent glow.
+            glow: [
+                { x: 0, y: 4, blur: 20, color: theme.colors.primary, opacity: 0.4 },
+            ],
         };
-        const { x, y, blur, color, opacity } = shadowConfigs[type];
-        // Don't boost the glow accent — it's already a deliberate, vivid alpha.
-        const alpha = color === theme.colors.primary ? opacity : Math.min(opacity * boost, 1);
+        const layers = shadowConfigs[type].map(({ x, y, blur, color, opacity }) => {
+            // Don't boost the glow accent — it's already a deliberate, vivid alpha.
+            const alpha = color === theme.colors.primary ? opacity : Math.min(opacity * boost, 1);
+            return `${x}px ${y}px ${blur}px ${withAlpha(color, alpha)}`;
+        });
         return {
-            boxShadow: `${x}px ${y}px ${blur}px ${withAlpha(color, alpha)}`,
+            boxShadow: layers.join(", "),
         };
     }, [theme]);
     const getFocusRingStyle = useCallback((offset = 2) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrmeg/expo-ui",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "private": false,
   "description": "Reusable Expo and React Native UI primitives for MrMeg projects.",
   "keywords": [
@@ -88,34 +88,35 @@
     "publish:dry-run": "bun pm pack --dry-run"
   },
   "dependencies": {
+    "@expo-google-fonts/inter": "^0.4.2",
     "@expo/vector-icons": ">=15.0.0 <16.0.0",
-    "@rn-primitives/accordion": "~1.4.0",
-    "@rn-primitives/alert-dialog": "~1.4.0",
-    "@rn-primitives/checkbox": "~1.4.0",
-    "@rn-primitives/collapsible": "~1.4.0",
-    "@rn-primitives/dialog": "~1.4.0",
-    "@rn-primitives/dropdown-menu": "~1.4.0",
-    "@rn-primitives/label": "~1.4.0",
-    "@rn-primitives/popover": "~1.4.0",
-    "@rn-primitives/portal": "~1.4.0",
-    "@rn-primitives/radio-group": "~1.4.0",
-    "@rn-primitives/select": "~1.4.0",
-    "@rn-primitives/separator": "~1.4.0",
-    "@rn-primitives/slot": "~1.4.0",
-    "@rn-primitives/switch": "~1.4.0",
-    "@rn-primitives/tabs": "~1.4.0",
-    "@rn-primitives/toggle": "~1.4.0",
-    "@rn-primitives/toggle-group": "~1.4.0",
-    "@rn-primitives/tooltip": "~1.4.0"
+    "@rn-primitives/accordion": "~1.5.2",
+    "@rn-primitives/alert-dialog": "~1.5.2",
+    "@rn-primitives/checkbox": "~1.5.2",
+    "@rn-primitives/collapsible": "~1.5.2",
+    "@rn-primitives/dialog": "~1.5.2",
+    "@rn-primitives/dropdown-menu": "~1.5.2",
+    "@rn-primitives/label": "~1.5.2",
+    "@rn-primitives/popover": "~1.5.2",
+    "@rn-primitives/portal": "~1.5.2",
+    "@rn-primitives/radio-group": "~1.5.2",
+    "@rn-primitives/select": "~1.5.2",
+    "@rn-primitives/separator": "~1.5.2",
+    "@rn-primitives/slot": "~1.5.2",
+    "@rn-primitives/switch": "~1.5.2",
+    "@rn-primitives/tabs": "~1.5.2",
+    "@rn-primitives/toggle": "~1.5.2",
+    "@rn-primitives/toggle-group": "~1.5.2",
+    "@rn-primitives/tooltip": "~1.5.2"
   },
   "peerDependencies": {
     "@expo/ui": ">=56.0.0 <58.0.0",
     "@react-native-async-storage/async-storage": ">=2.2.0 <2.3.0",
-    "expo": ">=55.0.0 <58.0.0",
-    "expo-font": ">=55.0.0 <58.0.0",
-    "expo-haptics": ">=55.0.0 <58.0.0",
+    "expo": ">=56.0.0 <58.0.0",
+    "expo-font": ">=56.0.0 <58.0.0",
+    "expo-haptics": ">=56.0.0 <58.0.0",
     "react": ">=19.2.0 <20.0.0",
-    "react-native": ">=0.83.0 <0.87.0",
+    "react-native": ">=0.85.0 <0.87.0",
     "react-native-gesture-handler": ">=2.30.0 <2.33.0",
     "react-native-keyboard-controller": ">=1.21.0 <2.0.0",
     "react-native-safe-area-context": ">=5.6.0 <6.0.0",
@@ -125,7 +126,6 @@
   },
   "devDependencies": {
     "@types/react": "~19.2.17",
-    "react-native-keyboard-controller": "1.21.9",
     "typescript": "~6.0.3"
   }
 }