melta-app 0.2.0 → 0.2.2

package/lib/module/components/Screen.js

@@ -13,8 +13,8 @@
  * SafeArea は registry（safe-area-registry.ts）で解決する。default は RN core の
  * SafeAreaView（deprecated / iOS のみの最小対応）で依存ゼロを維持しつつ、
  * react-native-safe-area-context 利用者は subpath "melta-app/safe-area" の
- * enableSafeAreaContext() で差し替えられる（rally-nav dogfood 由来、RN 0.85 の
- * core SafeAreaView deprecation 警告対応）。
+ * enableSafeAreaContext() で context hook + View adapter に差し替えられる
+ * （rally-nav dogfood 由来、RN 0.85 Fabric/Android の初回 inset flash 対応）。
  */
 
 import { useMemo } from "react";

package/lib/module/components/TextField.js

@@ -15,11 +15,38 @@
  */
 
 import { useMemo, useState } from "react";
-import { TextInput, View, Text as RNText } from "react-native";
+import { Platform, TextInput, View, Text as RNText } from "react-native";
 import { useTheme } from "../theme/index.js";
 import { CONTRACTS } from "../contracts/contract-types.js";
 import { resolveTextFieldStyle, resolveTextFieldFocusStyle } from "./textfield.styles.js";
+
+/**
+ * Android の EditText は固定 height と組み合わさると既定の縦 padding で文字が
+ * 上寄り・下端切れになるため、縦 padding を殺して縦センターに揃える。
+ * textAlignVertical は Android 専用、paddingVertical: 0 は iOS の見た目を変えない
+ * （iOS の単一行入力は元々縦センター）。
+ * さらに Android では Noto CJK のフォントメトリクス由来で文字インクが
+ * 1dp 強下寄りになる（Pixel 実機ピクセル実測 +2.7px/density2.5。
+ * includeFontPadding: false は gravity center 下では無効なことも実測済み）ため、
+ * paddingBottom の光学ナッジで打ち消す（gravity center は残り高さの中央に置くので
+ * paddingBottom p で p/2 上がる）。
+ * recipe（styleRefs）の写像ではなく RN 実装の補正なので resolver には置かない。
+ */
+/* eslint-disable melta/no-raw-spacing -- spacing の選択ではなく EditText 既定 padding の打ち消しと CJK 光学ナッジ（実測由来の固定値） */
+/** OS 毎の補正値を返す純関数（jest は Platform=ios 固定のため、Android 分岐はこれを直接検証する）。 */
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+export function resolveInputVerticalFix(os) {
+  return {
+    paddingVertical: 0,
+    ...(os === "android" ? {
+      paddingBottom: 2
+    } : null),
+    textAlignVertical: "center"
+  };
+}
+/* eslint-enable melta/no-raw-spacing */
+
+const INPUT_VERTICAL_FIX = resolveInputVerticalFix(Platform.OS);
 export function TextField({
   label,
   value,
@@ -68,7 +95,7 @@ export function TextField({
         if (!disabled) setFocused(true);
       },
       onBlur: () => setFocused(false),
-      style: [resolved.input, focused && !disabled ? focusStyle : null]
+      style: [resolved.input, INPUT_VERTICAL_FIX, focused && !disabled ? focusStyle : null]
     }), helperText != null && !showError && /*#__PURE__*/_jsx(RNText, {
       style: resolved.helperText,
       children: helperText

package/lib/module/components/TextField.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useState","TextInput","View","Text","RNText","useTheme","CONTRACTS","resolveTextFieldStyle","resolveTextFieldFocusStyle","jsx","_jsx","jsxs","_jsxs","TextField","label","value","onChangeText","placeholder","variant","disabled","size","helperText","errorText","style","testID","theme","mode","colors","focused","setFocused","effectiveVariant","resolved","focusStyle","showError","children","placeholderTextColor","editable","accessibilityLabel","accessibilityState","onFocus","onBlur","input","__contract","textfield"],"sourceRoot":"../../../src","sources":["components/TextField.tsx"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AACzC,SACEC,SAAS,EACTC,IAAI,EACJC,IAAI,IAAIC,MAAM,QAGT,cAAc;AACrB,SAASC,QAAQ,QAAQ,mBAAU;AACnC,SAASC,SAAS,QAAQ,gCAA6B;AACvD,SACEC,qBAAqB,EACrBC,0BAA0B,QAErB,uBAAoB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAqB5B,OAAO,SAASC,SAASA,CAAC;EACxBC,KAAK;EACLC,KAAK;EACLC,YAAY;EACZC,WAAW;EACXC,OAAO,GAAG,SAAS;EACnBC,QAAQ,GAAG,KAAK;EAChBC,IAAI,GAAG,QAAQ;EACfC,UAAU;EACVC,SAAS;EACTC,KAAK;EACLC;AACc,CAAC,EAAE;EACjB,MAAM;IAAEC,KAAK;IAAEC,IAAI;IAAEC;EAAO,CAAC,GAAGtB,QAAQ,CAAC,CAAC;EAC1C,MAAM,CAACuB,OAAO,EAAEC,UAAU,CAAC,GAAG7B,QAAQ,CAAC,KAAK,CAAC;;EAE7C;EACA,MAAM8B,gBAAgB,GAAGX,QAAQ,GAAG,UAAU,GAAGD,OAAO;EACxD,MAAMa,QAAQ,GAAGhC,OAAO,CACtB,MAAMQ,qBAAqB,CAACkB,KAAK,EAAEC,IAAI,EAAE;IAAER,OAAO,EAAEY,gBAAgB;IAAEV;EAAK,CAAC,CAAC,EAC7E,CAACK,KAAK,EAAEC,IAAI,EAAEI,gBAAgB,EAAEV,IAAI,CACtC,CAAC;EACD,MAAMY,UAAU,GAAGjC,OAAO,CAAC,MAAMS,0BAA0B,CAACiB,KAAK,CAAC,EAAE,CAACA,KAAK,CAAC,CAAC;EAE5E,MAAMQ,SAAS,GAAGH,gBAAgB,KAAK,OAAO,IAAIR,SAAS,IAAI,IAAI;EAEnE,oBACEV,KAAA,CAACV,IAAI;IAACqB,KAAK,EAAEA,KAAM;IAACC,MAAM,EAAEA,MAAO;IAAAU,QAAA,gBACjCxB,IAAA,CAACN,MAAM;MAACmB,KAAK,EAAEQ,QAAQ,CAACjB,KAAM;MAAAoB,QAAA,EAAEpB;IAAK,CAAS,CAAC,eAC/CJ,IAAA,CAACT,SAAS;MACRc,KAAK,EAAEA,KAAM;MACbC,YAAY,EAAEA,YAAa;MAC3BC,WAAW,EAAEA,WAAY;MACzBkB,oBAAoB,EAAER,MAAM,CAAC,YAAY,CAAE;MAC3CS,QAAQ,EAAE,CAACjB,QAAS;MACpBkB,kBAAkB,EAAEvB,KAAM;MAC1BwB,kBAAkB,EAAE;QAAEnB;MAAS,CAAE;MACjCoB,OAAO,EAAEA,CAAA,KAAM;QACb,IAAI,CAACpB,QAAQ,EAAEU,UAAU,CAAC,IAAI,CAAC;MACjC,CAAE;MACFW,MAAM,EAAEA,CAAA,KAAMX,UAAU,CAAC,KAAK,CAAE;MAChCN,KAAK,EAAE,CAACQ,QAAQ,CAACU,KAAK,EAAEb,OAAO,IAAI,CAACT,QAAQ,GAAGa,UAAU,GAAG,IAAI;IAAE,CACnE,CAAC,EACDX,UAAU,IAAI,IAAI,IAAI,CAACY,SAAS,iBAC/BvB,IAAA,CAACN,MAAM;MAACmB,KAAK,EAAEQ,QAAQ,CAACV,UAAW;MAAAa,QAAA,EAAEb;IAAU,CAAS,CACzD,EACAY,SAAS,iBAAIvB,IAAA,CAACN,MAAM;MAACmB,KAAK,EAAEQ,QAAQ,CAACT,SAAU;MAAAY,QAAA,EAAEZ;IAAS,CAAS,CAAC;EAAA,CACjE,CAAC;AAEX;;AAEA;AACAT,SAAS,CAAC6B,UAAU,GAAGpC,SAAS,CAACqC,SAAS","ignoreList":[]}
+{"version":3,"names":["useMemo","useState","Platform","TextInput","View","Text","RNText","useTheme","CONTRACTS","resolveTextFieldStyle","resolveTextFieldFocusStyle","jsx","_jsx","jsxs","_jsxs","resolveInputVerticalFix","os","paddingVertical","paddingBottom","textAlignVertical","INPUT_VERTICAL_FIX","OS","TextField","label","value","onChangeText","placeholder","variant","disabled","size","helperText","errorText","style","testID","theme","mode","colors","focused","setFocused","effectiveVariant","resolved","focusStyle","showError","children","placeholderTextColor","editable","accessibilityLabel","accessibilityState","onFocus","onBlur","input","__contract","textfield"],"sourceRoot":"../../../src","sources":["components/TextField.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/safe-area-registry.js

@@ -6,8 +6,9 @@
  * 本体エントリは依存ゼロ方針（P1）のため、default は RN core の SafeAreaView
  * （deprecated / iOS のみの最小対応）。react-native-safe-area-context を使う利用者は
  * subpath "melta-app/safe-area" の enableSafeAreaContext() をアプリ起動時に一度呼ぶと
- * Screen の SafeArea が差し替わる（optional peer の前例 = Icon × react-native-svg。
- * ただし Screen は本体エントリ所属のため subpath 分離ではなく registry で切り替える）。
+ * Screen の SafeArea が context hook + View adapter に差し替わる（optional peer の前例 =
+ * Icon × react-native-svg。ただし Screen は本体エントリ所属のため subpath 分離ではなく
+ * registry で切り替える）。
  *
  * ⚠️ RN 0.85 は react-native の SafeAreaView プロパティへの getter アクセス時点で
  * deprecation 警告を出す。adapter 登録済みの利用者に警告を出さないため、core への

package/lib/module/components/safe-area-registry.js.map

@@ -1 +1 @@
-{"version":3,"names":["ReactNative","registered","setSafeAreaView","component","resolveSafeAreaView","SafeAreaView"],"sourceRoot":"../../../src","sources":["components/safe-area-registry.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA,OAAO,KAAKA,WAAW,MAAM,cAAc;;AAE3C;;AASA,IAAIC,UAAmC,GAAG,IAAI;;AAE9C;AACA,OAAO,SAASC,eAAeA,CAACC,SAA2B,EAAQ;EACjEF,UAAU,GAAGE,SAAS;AACxB;;AAEA;AACA,OAAO,SAASC,mBAAmBA,CAAA,EAAqB;EACtD,OAAOH,UAAU,IAAKD,WAAW,CAACK,YAAiC;AACrE","ignoreList":[]}
+{"version":3,"names":["ReactNative","registered","setSafeAreaView","component","resolveSafeAreaView","SafeAreaView"],"sourceRoot":"../../../src","sources":["components/safe-area-registry.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA,OAAO,KAAKA,WAAW,MAAM,cAAc;;AAE3C;;AASA,IAAIC,UAAmC,GAAG,IAAI;;AAE9C;AACA,OAAO,SAASC,eAAeA,CAACC,SAA2B,EAAQ;EACjEF,UAAU,GAAGE,SAAS;AACxB;;AAEA;AACA,OAAO,SAASC,mBAAmBA,CAAA,EAAqB;EACtD,OAAOH,UAAU,IAAKD,WAAW,CAACK,YAAiC;AACrE","ignoreList":[]}

package/lib/module/safe-area/index.js

@@ -13,15 +13,65 @@
  *   import { enableSafeAreaContext } from "melta-app/safe-area";
  *   enableSafeAreaContext();
  *
- * これで Screen の SafeArea が react-native-safe-area-context の SafeAreaView に
- * 切り替わり、RN core SafeAreaView の deprecation 警告（RN 0.85+）も出なくなる。
+ * これで Screen の SafeArea が useSafeAreaInsets() + View の adapter に切り替わる。
+ * Provider の context 値を render 中に同期参照して padding を付けるため、native
+ * SafeAreaView の layout/state 更新を待たず、初回 render から inset が反映される。
+ *
+ * ⚠️ 前提: アプリの root に SafeAreaProvider が必要。初回 render から正しい inset を
+ * 使うには Provider に initialMetrics も渡す。React Navigation / Expo Router 利用時は
+ * Provider が設置済みのことが多い。
  */
 
-import { SafeAreaView } from "react-native-safe-area-context";
+import { createElement, useMemo } from "react";
+import { StyleSheet, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { setSafeAreaView } from "../components/safe-area-registry.js";
+const ALL_EDGES = ["top", "right", "bottom", "left"];
+
+/** enableSafeAreaContext() の設定。edges 省略時は従来相当の全 edge。 */
+
+function additivePadding(style, insets, edges) {
+  const flat = StyleSheet.flatten(style) ?? {};
+  const base = edge => {
+    const edgeValue = flat[`padding${edge[0].toUpperCase()}${edge.slice(1)}`];
+    const axisValue = edge === "top" || edge === "bottom" ? flat.paddingVertical : flat.paddingHorizontal;
+    const value = edgeValue ?? axisValue ?? flat.padding;
+    return typeof value === "number" ? value : 0;
+  };
+  return {
+    ...(edges.has("top") ? {
+      paddingTop: base("top") + insets.top
+    } : null),
+    ...(edges.has("right") ? {
+      paddingRight: base("right") + insets.right
+    } : null),
+    ...(edges.has("bottom") ? {
+      paddingBottom: base("bottom") + insets.bottom
+    } : null),
+    ...(edges.has("left") ? {
+      paddingLeft: base("left") + insets.left
+    } : null)
+  };
+}
+function createContextSafeAreaView(selectedEdges) {
+  const edges = new Set(selectedEdges);
+  function ContextSafeAreaView({
+    style,
+    ...props
+  }) {
+    const insets = useSafeAreaInsets();
+    const paddingStyle = useMemo(() => additivePadding(style, insets, edges), [style, insets.top, insets.right, insets.bottom, insets.left]);
+    return /*#__PURE__*/createElement(View, {
+      ...props,
+      style: [style, paddingStyle]
+    });
+  }
+  ContextSafeAreaView.displayName = "MeltaContextSafeAreaView";
+  return ContextSafeAreaView;
+}
 
-/** Screen の SafeArea を react-native-safe-area-context に切り替える。 */
-export function enableSafeAreaContext() {
-  setSafeAreaView(SafeAreaView);
+/** Screen の SafeArea を context 同期参照の View adapter に切り替える。 */
+export function enableSafeAreaContext(options = {}) {
+  setSafeAreaView(createContextSafeAreaView(options.edges ?? ALL_EDGES));
 }
 //# sourceMappingURL=index.js.map

package/lib/module/safe-area/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["SafeAreaView","setSafeAreaView","enableSafeAreaContext"],"sourceRoot":"../../../src","sources":["safe-area/index.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,YAAY,QAAQ,gCAAgC;AAC7D,SAASC,eAAe,QAAQ,qCAAkC;;AAElE;AACA,OAAO,SAASC,qBAAqBA,CAAA,EAAS;EAC5CD,eAAe,CAACD,YAAY,CAAC;AAC/B","ignoreList":[]}
+{"version":3,"names":["createElement","useMemo","StyleSheet","View","useSafeAreaInsets","setSafeAreaView","ALL_EDGES","additivePadding","style","insets","edges","flat","flatten","base","edge","edgeValue","toUpperCase","slice","axisValue","paddingVertical","paddingHorizontal","value","padding","has","paddingTop","top","paddingRight","right","paddingBottom","bottom","paddingLeft","left","createContextSafeAreaView","selectedEdges","Set","ContextSafeAreaView","props","paddingStyle","displayName","enableSafeAreaContext","options"],"sourceRoot":"../../../src","sources":["safe-area/index.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/components/Screen.d.ts

@@ -11,8 +11,8 @@
  * SafeArea は registry（safe-area-registry.ts）で解決する。default は RN core の
  * SafeAreaView（deprecated / iOS のみの最小対応）で依存ゼロを維持しつつ、
  * react-native-safe-area-context 利用者は subpath "melta-app/safe-area" の
- * enableSafeAreaContext() で差し替えられる（rally-nav dogfood 由来、RN 0.85 の
- * core SafeAreaView deprecation 警告対応）。
+ * enableSafeAreaContext() で context hook + View adapter に差し替えられる
+ * （rally-nav dogfood 由来、RN 0.85 Fabric/Android の初回 inset flash 対応）。
  */
 import { type ReactNode } from "react";
 import { type StyleProp, type ViewStyle } from "react-native";

package/lib/typescript/src/components/TextField.d.ts

@@ -11,8 +11,22 @@
  * - 色・寸法の決定は pure resolver（textfield.styles.ts）に分離。
  *   recipes/app/textfield.recipe.json との機械照合は scripts/lib/textfield-conformance.test.ts が行う。
  */
-import { type StyleProp, type ViewStyle } from "react-native";
+import { Platform, type StyleProp, type TextStyle, type ViewStyle } from "react-native";
 import { type TextFieldSize } from "./textfield.styles";
+/**
+ * Android の EditText は固定 height と組み合わさると既定の縦 padding で文字が
+ * 上寄り・下端切れになるため、縦 padding を殺して縦センターに揃える。
+ * textAlignVertical は Android 専用、paddingVertical: 0 は iOS の見た目を変えない
+ * （iOS の単一行入力は元々縦センター）。
+ * さらに Android では Noto CJK のフォントメトリクス由来で文字インクが
+ * 1dp 強下寄りになる（Pixel 実機ピクセル実測 +2.7px/density2.5。
+ * includeFontPadding: false は gravity center 下では無効なことも実測済み）ため、
+ * paddingBottom の光学ナッジで打ち消す（gravity center は残り高さの中央に置くので
+ * paddingBottom p で p/2 上がる）。
+ * recipe（styleRefs）の写像ではなく RN 実装の補正なので resolver には置かない。
+ */
+/** OS 毎の補正値を返す純関数（jest は Platform=ios 固定のため、Android 分岐はこれを直接検証する）。 */
+export declare function resolveInputVerticalFix(os: typeof Platform.OS): TextStyle;
 interface TextFieldProps {
     /** ラベル（必須。placeholder だけの入力欄を作らせない = FORM_NO_LABEL_OMIT）。 */
     label: string;

package/lib/typescript/src/components/TextField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TextField.d.ts","sourceRoot":"","sources":["../../../../src/components/TextField.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAGtB,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,oBAAoB,CAAC;AAE5B,UAAU,cAAc;IACtB,6DAA6D;IAC7D,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+DAA+D;IAC/D,OAAO,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAC1C,uFAAuF;IACvF,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sDAAsD;IACtD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,SAAS,CAAC,EACxB,KAAK,EACL,KAAK,EACL,YAAY,EACZ,WAAW,EACX,OAAmB,EACnB,QAAgB,EAChB,IAAe,EACf,UAAU,EACV,SAAS,EACT,KAAK,EACL,MAAM,GACP,EAAE,cAAc,2CAqChB;yBAjDe,SAAS"}
+{"version":3,"file":"TextField.d.ts","sourceRoot":"","sources":["../../../../src/components/TextField.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EACL,QAAQ,EAIR,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAGtB,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,oBAAoB,CAAC;AAE5B;;;;;;;;;;;GAWG;AAEH,sEAAsE;AACtE,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,OAAO,QAAQ,CAAC,EAAE,GAAG,SAAS,CAMzE;AAKD,UAAU,cAAc;IACtB,6DAA6D;IAC7D,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+DAA+D;IAC/D,OAAO,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAC1C,uFAAuF;IACvF,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sDAAsD;IACtD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,SAAS,CAAC,EACxB,KAAK,EACL,KAAK,EACL,YAAY,EACZ,WAAW,EACX,OAAmB,EACnB,QAAgB,EAChB,IAAe,EACf,UAAU,EACV,SAAS,EACT,KAAK,EACL,MAAM,GACP,EAAE,cAAc,2CAqChB;yBAjDe,SAAS"}

package/lib/typescript/src/components/safe-area-registry.d.ts

@@ -4,8 +4,9 @@
  * 本体エントリは依存ゼロ方針（P1）のため、default は RN core の SafeAreaView
  * （deprecated / iOS のみの最小対応）。react-native-safe-area-context を使う利用者は
  * subpath "melta-app/safe-area" の enableSafeAreaContext() をアプリ起動時に一度呼ぶと
- * Screen の SafeArea が差し替わる（optional peer の前例 = Icon × react-native-svg。
- * ただし Screen は本体エントリ所属のため subpath 分離ではなく registry で切り替える）。
+ * Screen の SafeArea が context hook + View adapter に差し替わる（optional peer の前例 =
+ * Icon × react-native-svg。ただし Screen は本体エントリ所属のため subpath 分離ではなく
+ * registry で切り替える）。
  *
  * ⚠️ RN 0.85 は react-native の SafeAreaView プロパティへの getter アクセス時点で
  * deprecation 警告を出す。adapter 登録済みの利用者に警告を出さないため、core への

package/lib/typescript/src/components/safe-area-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"safe-area-registry.d.ts","sourceRoot":"","sources":["../../../../src/components/safe-area-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzD,uEAAuE;AACvE,MAAM,WAAW,qBAAqB;IACpC,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,MAAM,gBAAgB,GAAG,aAAa,CAAC,qBAAqB,CAAC,CAAC;AAIpE,kDAAkD;AAClD,wBAAgB,eAAe,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI,CAEjE;AAED,4DAA4D;AAC5D,wBAAgB,mBAAmB,IAAI,gBAAgB,CAEtD"}
+{"version":3,"file":"safe-area-registry.d.ts","sourceRoot":"","sources":["../../../../src/components/safe-area-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzD,uEAAuE;AACvE,MAAM,WAAW,qBAAqB;IACpC,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,MAAM,gBAAgB,GAAG,aAAa,CAAC,qBAAqB,CAAC,CAAC;AAIpE,kDAAkD;AAClD,wBAAgB,eAAe,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI,CAEjE;AAED,4DAA4D;AAC5D,wBAAgB,mBAAmB,IAAI,gBAAgB,CAEtD"}

package/lib/typescript/src/safe-area/index.d.ts

@@ -11,9 +11,20 @@
  *   import { enableSafeAreaContext } from "melta-app/safe-area";
  *   enableSafeAreaContext();
  *
- * これで Screen の SafeArea が react-native-safe-area-context の SafeAreaView に
- * 切り替わり、RN core SafeAreaView の deprecation 警告（RN 0.85+）も出なくなる。
+ * これで Screen の SafeArea が useSafeAreaInsets() + View の adapter に切り替わる。
+ * Provider の context 値を render 中に同期参照して padding を付けるため、native
+ * SafeAreaView の layout/state 更新を待たず、初回 render から inset が反映される。
+ *
+ * ⚠️ 前提: アプリの root に SafeAreaProvider が必要。初回 render から正しい inset を
+ * 使うには Provider に initialMetrics も渡す。React Navigation / Expo Router 利用時は
+ * Provider が設置済みのことが多い。
  */
-/** Screen の SafeArea を react-native-safe-area-context に切り替える。 */
-export declare function enableSafeAreaContext(): void;
+import { type Edge } from "react-native-safe-area-context";
+/** enableSafeAreaContext() の設定。edges 省略時は従来相当の全 edge。 */
+export interface EnableSafeAreaContextOptions {
+    /** Screen に適用する edge。tab bar 等が担当する edge は除外する。 */
+    edges?: readonly Edge[];
+}
+/** Screen の SafeArea を context 同期参照の View adapter に切り替える。 */
+export declare function enableSafeAreaContext(options?: EnableSafeAreaContextOptions): void;
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/safe-area/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/safe-area/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,iEAAiE;AACjE,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/safe-area/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH,OAAO,EAEL,KAAK,IAAI,EAEV,MAAM,gCAAgC,CAAC;AASxC,yDAAyD;AACzD,MAAM,WAAW,4BAA4B;IAC3C,mDAAmD;IACnD,KAAK,CAAC,EAAE,SAAS,IAAI,EAAE,CAAC;CACzB;AA0CD,6DAA6D;AAC7D,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,4BAAiC,GAAG,IAAI,CAEtF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "melta-app",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "melta for APP — melta デザインシステムの React Native UI kit。melta-contracts（デザイン契約）を single source of truth に RN 実装でその契約を満たす。アプリ本体ではなくライブラリ。",
   "license": "MIT",
   "homepage": "https://app.melta.tsubotax.com",

package/src/components/Screen.tsx

@@ -11,8 +11,8 @@
  * SafeArea は registry（safe-area-registry.ts）で解決する。default は RN core の
  * SafeAreaView（deprecated / iOS のみの最小対応）で依存ゼロを維持しつつ、
  * react-native-safe-area-context 利用者は subpath "melta-app/safe-area" の
- * enableSafeAreaContext() で差し替えられる（rally-nav dogfood 由来、RN 0.85 の
- * core SafeAreaView deprecation 警告対応）。
+ * enableSafeAreaContext() で context hook + View adapter に差し替えられる
+ * （rally-nav dogfood 由来、RN 0.85 Fabric/Android の初回 inset flash 対応）。
  */
 
 import { useMemo, type ReactNode } from "react";

package/src/components/TextField.tsx

@@ -14,10 +14,12 @@
 
 import { useMemo, useState } from "react";
 import {
+  Platform,
   TextInput,
   View,
   Text as RNText,
   type StyleProp,
+  type TextStyle,
   type ViewStyle,
 } from "react-native";
 import { useTheme } from "../theme";
@@ -28,6 +30,31 @@ import {
   type TextFieldSize,
 } from "./textfield.styles";
 
+/**
+ * Android の EditText は固定 height と組み合わさると既定の縦 padding で文字が
+ * 上寄り・下端切れになるため、縦 padding を殺して縦センターに揃える。
+ * textAlignVertical は Android 専用、paddingVertical: 0 は iOS の見た目を変えない
+ * （iOS の単一行入力は元々縦センター）。
+ * さらに Android では Noto CJK のフォントメトリクス由来で文字インクが
+ * 1dp 強下寄りになる（Pixel 実機ピクセル実測 +2.7px/density2.5。
+ * includeFontPadding: false は gravity center 下では無効なことも実測済み）ため、
+ * paddingBottom の光学ナッジで打ち消す（gravity center は残り高さの中央に置くので
+ * paddingBottom p で p/2 上がる）。
+ * recipe（styleRefs）の写像ではなく RN 実装の補正なので resolver には置かない。
+ */
+/* eslint-disable melta/no-raw-spacing -- spacing の選択ではなく EditText 既定 padding の打ち消しと CJK 光学ナッジ（実測由来の固定値） */
+/** OS 毎の補正値を返す純関数（jest は Platform=ios 固定のため、Android 分岐はこれを直接検証する）。 */
+export function resolveInputVerticalFix(os: typeof Platform.OS): TextStyle {
+  return {
+    paddingVertical: 0,
+    ...(os === "android" ? { paddingBottom: 2 } : null),
+    textAlignVertical: "center",
+  };
+}
+/* eslint-enable melta/no-raw-spacing */
+
+const INPUT_VERTICAL_FIX = resolveInputVerticalFix(Platform.OS);
+
 interface TextFieldProps {
   /** ラベル（必須。placeholder だけの入力欄を作らせない = FORM_NO_LABEL_OMIT）。 */
   label: string;
@@ -88,7 +115,7 @@ export function TextField({
           if (!disabled) setFocused(true);
         }}
         onBlur={() => setFocused(false)}
-        style={[resolved.input, focused && !disabled ? focusStyle : null]}
+        style={[resolved.input, INPUT_VERTICAL_FIX, focused && !disabled ? focusStyle : null]}
       />
       {helperText != null && !showError && (
         <RNText style={resolved.helperText}>{helperText}</RNText>

package/src/components/safe-area-registry.ts

@@ -4,8 +4,9 @@
  * 本体エントリは依存ゼロ方針（P1）のため、default は RN core の SafeAreaView
  * （deprecated / iOS のみの最小対応）。react-native-safe-area-context を使う利用者は
  * subpath "melta-app/safe-area" の enableSafeAreaContext() をアプリ起動時に一度呼ぶと
- * Screen の SafeArea が差し替わる（optional peer の前例 = Icon × react-native-svg。
- * ただし Screen は本体エントリ所属のため subpath 分離ではなく registry で切り替える）。
+ * Screen の SafeArea が context hook + View adapter に差し替わる（optional peer の前例 =
+ * Icon × react-native-svg。ただし Screen は本体エントリ所属のため subpath 分離ではなく
+ * registry で切り替える）。
  *
  * ⚠️ RN 0.85 は react-native の SafeAreaView プロパティへの getter アクセス時点で
  * deprecation 警告を出す。adapter 登録済みの利用者に警告を出さないため、core への

package/src/safe-area/index.ts

@@ -11,18 +11,77 @@
  *   import { enableSafeAreaContext } from "melta-app/safe-area";
  *   enableSafeAreaContext();
  *
- * これで Screen の SafeArea が react-native-safe-area-context の SafeAreaView に
- * 切り替わり、RN core SafeAreaView の deprecation 警告（RN 0.85+）も出なくなる。
+ * これで Screen の SafeArea が useSafeAreaInsets() + View の adapter に切り替わる。
+ * Provider の context 値を render 中に同期参照して padding を付けるため、native
+ * SafeAreaView の layout/state 更新を待たず、初回 render から inset が反映される。
  *
- * ⚠️ 前提: アプリの root に SafeAreaProvider が必要（context 版 SafeAreaView は
- * nearest provider から inset を取る。無いと inset が効かない）。React Navigation /
- * Expo Router 利用時は設置済みのことが多い。
+ * ⚠️ 前提: アプリの root に SafeAreaProvider が必要。初回 render から正しい inset を
+ * 使うには Provider に initialMetrics も渡す。React Navigation / Expo Router 利用時は
+ * Provider が設置済みのことが多い。
  */
 
-import { SafeAreaView } from "react-native-safe-area-context";
-import { setSafeAreaView } from "../components/safe-area-registry";
+import { createElement, useMemo } from "react";
+import { StyleSheet, View, type ViewStyle } from "react-native";
+import {
+  useSafeAreaInsets,
+  type Edge,
+  type EdgeInsets,
+} from "react-native-safe-area-context";
+import {
+  setSafeAreaView,
+  type SafeAreaViewLike,
+  type SafeAreaViewLikeProps,
+} from "../components/safe-area-registry";
 
-/** Screen の SafeArea を react-native-safe-area-context に切り替える。 */
-export function enableSafeAreaContext(): void {
-  setSafeAreaView(SafeAreaView);
+const ALL_EDGES = ["top", "right", "bottom", "left"] as const satisfies readonly Edge[];
+
+/** enableSafeAreaContext() の設定。edges 省略時は従来相当の全 edge。 */
+export interface EnableSafeAreaContextOptions {
+  /** Screen に適用する edge。tab bar 等が担当する edge は除外する。 */
+  edges?: readonly Edge[];
+}
+
+function additivePadding(
+  style: SafeAreaViewLikeProps["style"],
+  insets: EdgeInsets,
+  edges: ReadonlySet<Edge>,
+): ViewStyle {
+  const flat = StyleSheet.flatten(style) ?? {};
+
+  const base = (edge: Edge): number => {
+    const edgeValue = flat[`padding${edge[0].toUpperCase()}${edge.slice(1)}` as keyof ViewStyle];
+    const axisValue =
+      edge === "top" || edge === "bottom" ? flat.paddingVertical : flat.paddingHorizontal;
+    const value = edgeValue ?? axisValue ?? flat.padding;
+    return typeof value === "number" ? value : 0;
+  };
+
+  return {
+    ...(edges.has("top") ? { paddingTop: base("top") + insets.top } : null),
+    ...(edges.has("right") ? { paddingRight: base("right") + insets.right } : null),
+    ...(edges.has("bottom") ? { paddingBottom: base("bottom") + insets.bottom } : null),
+    ...(edges.has("left") ? { paddingLeft: base("left") + insets.left } : null),
+  };
+}
+
+function createContextSafeAreaView(selectedEdges: readonly Edge[]): SafeAreaViewLike {
+  const edges = new Set(selectedEdges);
+
+  function ContextSafeAreaView({ style, ...props }: SafeAreaViewLikeProps) {
+    const insets = useSafeAreaInsets();
+    const paddingStyle = useMemo(
+      () => additivePadding(style, insets, edges),
+      [style, insets.top, insets.right, insets.bottom, insets.left],
+    );
+
+    return createElement(View, { ...props, style: [style, paddingStyle] });
+  }
+
+  ContextSafeAreaView.displayName = "MeltaContextSafeAreaView";
+  return ContextSafeAreaView;
+}
+
+/** Screen の SafeArea を context 同期参照の View adapter に切り替える。 */
+export function enableSafeAreaContext(options: EnableSafeAreaContextOptions = {}): void {
+  setSafeAreaView(createContextSafeAreaView(options.edges ?? ALL_EDGES));
 }