melta-app 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -13,8 +13,8 @@
13
13
  * SafeArea は registry(safe-area-registry.ts)で解決する。default は RN core の
14
14
  * SafeAreaView(deprecated / iOS のみの最小対応)で依存ゼロを維持しつつ、
15
15
  * react-native-safe-area-context 利用者は subpath "melta-app/safe-area" の
16
- * enableSafeAreaContext() で差し替えられる(rally-nav dogfood 由来、RN 0.85
17
- * core SafeAreaView deprecation 警告対応)。
16
+ * enableSafeAreaContext() context hook + View adapter に差し替えられる
17
+ * (rally-nav dogfood 由来、RN 0.85 Fabric/Android の初回 inset flash 対応)。
18
18
  */
19
19
 
20
20
  import { useMemo } from "react";
@@ -6,8 +6,9 @@
6
6
  * 本体エントリは依存ゼロ方針(P1)のため、default は RN core の SafeAreaView
7
7
  * (deprecated / iOS のみの最小対応)。react-native-safe-area-context を使う利用者は
8
8
  * subpath "melta-app/safe-area" の enableSafeAreaContext() をアプリ起動時に一度呼ぶと
9
- * Screen の SafeArea が差し替わる(optional peer の前例 = Icon × react-native-svg。
10
- * ただし Screen は本体エントリ所属のため subpath 分離ではなく registry で切り替える)。
9
+ * Screen の SafeArea が context hook + View adapter に差し替わる(optional peer の前例 =
10
+ * Icon × react-native-svg。ただし Screen は本体エントリ所属のため subpath 分離ではなく
11
+ * registry で切り替える)。
11
12
  *
12
13
  * ⚠️ RN 0.85 は react-native の SafeAreaView プロパティへの getter アクセス時点で
13
14
  * deprecation 警告を出す。adapter 登録済みの利用者に警告を出さないため、core への
@@ -1 +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":[]}
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;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":[]}
@@ -13,15 +13,65 @@
13
13
  * import { enableSafeAreaContext } from "melta-app/safe-area";
14
14
  * enableSafeAreaContext();
15
15
  *
16
- * これで Screen の SafeArea が react-native-safe-area-contextSafeAreaView
17
- * 切り替わり、RN core SafeAreaView deprecation 警告(RN 0.85+)も出なくなる。
16
+ * これで Screen の SafeArea が useSafeAreaInsets() + View adapter に切り替わる。
17
+ * Provider context 値を render 中に同期参照して padding を付けるため、native
18
+ * SafeAreaView の layout/state 更新を待たず、初回 render から inset が反映される。
19
+ *
20
+ * ⚠️ 前提: アプリの root に SafeAreaProvider が必要。初回 render から正しい inset を
21
+ * 使うには Provider に initialMetrics も渡す。React Navigation / Expo Router 利用時は
22
+ * Provider が設置済みのことが多い。
18
23
  */
19
24
 
20
- import { SafeAreaView } from "react-native-safe-area-context";
25
+ import { createElement, useMemo } from "react";
26
+ import { StyleSheet, View } from "react-native";
27
+ import { useSafeAreaInsets } from "react-native-safe-area-context";
21
28
  import { setSafeAreaView } from "../components/safe-area-registry.js";
29
+ const ALL_EDGES = ["top", "right", "bottom", "left"];
30
+
31
+ /** enableSafeAreaContext() の設定。edges 省略時は従来相当の全 edge。 */
32
+
33
+ function additivePadding(style, insets, edges) {
34
+ const flat = StyleSheet.flatten(style) ?? {};
35
+ const base = edge => {
36
+ const edgeValue = flat[`padding${edge[0].toUpperCase()}${edge.slice(1)}`];
37
+ const axisValue = edge === "top" || edge === "bottom" ? flat.paddingVertical : flat.paddingHorizontal;
38
+ const value = edgeValue ?? axisValue ?? flat.padding;
39
+ return typeof value === "number" ? value : 0;
40
+ };
41
+ return {
42
+ ...(edges.has("top") ? {
43
+ paddingTop: base("top") + insets.top
44
+ } : null),
45
+ ...(edges.has("right") ? {
46
+ paddingRight: base("right") + insets.right
47
+ } : null),
48
+ ...(edges.has("bottom") ? {
49
+ paddingBottom: base("bottom") + insets.bottom
50
+ } : null),
51
+ ...(edges.has("left") ? {
52
+ paddingLeft: base("left") + insets.left
53
+ } : null)
54
+ };
55
+ }
56
+ function createContextSafeAreaView(selectedEdges) {
57
+ const edges = new Set(selectedEdges);
58
+ function ContextSafeAreaView({
59
+ style,
60
+ ...props
61
+ }) {
62
+ const insets = useSafeAreaInsets();
63
+ const paddingStyle = useMemo(() => additivePadding(style, insets, edges), [style, insets.top, insets.right, insets.bottom, insets.left]);
64
+ return /*#__PURE__*/createElement(View, {
65
+ ...props,
66
+ style: [style, paddingStyle]
67
+ });
68
+ }
69
+ ContextSafeAreaView.displayName = "MeltaContextSafeAreaView";
70
+ return ContextSafeAreaView;
71
+ }
22
72
 
23
- /** Screen の SafeArea を react-native-safe-area-context に切り替える。 */
24
- export function enableSafeAreaContext() {
25
- setSafeAreaView(SafeAreaView);
73
+ /** Screen の SafeArea を context 同期参照の View adapter に切り替える。 */
74
+ export function enableSafeAreaContext(options = {}) {
75
+ setSafeAreaView(createContextSafeAreaView(options.edges ?? ALL_EDGES));
26
76
  }
27
77
  //# sourceMappingURL=index.js.map
@@ -1 +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":[]}
1
+ {"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":[]}
@@ -11,8 +11,8 @@
11
11
  * SafeArea は registry(safe-area-registry.ts)で解決する。default は RN core の
12
12
  * SafeAreaView(deprecated / iOS のみの最小対応)で依存ゼロを維持しつつ、
13
13
  * react-native-safe-area-context 利用者は subpath "melta-app/safe-area" の
14
- * enableSafeAreaContext() で差し替えられる(rally-nav dogfood 由来、RN 0.85
15
- * core SafeAreaView deprecation 警告対応)。
14
+ * enableSafeAreaContext() context hook + View adapter に差し替えられる
15
+ * (rally-nav dogfood 由来、RN 0.85 Fabric/Android の初回 inset flash 対応)。
16
16
  */
17
17
  import { type ReactNode } from "react";
18
18
  import { type StyleProp, type ViewStyle } from "react-native";
@@ -4,8 +4,9 @@
4
4
  * 本体エントリは依存ゼロ方針(P1)のため、default は RN core の SafeAreaView
5
5
  * (deprecated / iOS のみの最小対応)。react-native-safe-area-context を使う利用者は
6
6
  * subpath "melta-app/safe-area" の enableSafeAreaContext() をアプリ起動時に一度呼ぶと
7
- * Screen の SafeArea が差し替わる(optional peer の前例 = Icon × react-native-svg。
8
- * ただし Screen は本体エントリ所属のため subpath 分離ではなく registry で切り替える)。
7
+ * Screen の SafeArea が context hook + View adapter に差し替わる(optional peer の前例 =
8
+ * Icon × react-native-svg。ただし Screen は本体エントリ所属のため subpath 分離ではなく
9
+ * registry で切り替える)。
9
10
  *
10
11
  * ⚠️ RN 0.85 は react-native の SafeAreaView プロパティへの getter アクセス時点で
11
12
  * deprecation 警告を出す。adapter 登録済みの利用者に警告を出さないため、core への
@@ -1 +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"}
1
+ {"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"}
@@ -11,9 +11,20 @@
11
11
  * import { enableSafeAreaContext } from "melta-app/safe-area";
12
12
  * enableSafeAreaContext();
13
13
  *
14
- * これで Screen の SafeArea が react-native-safe-area-contextSafeAreaView
15
- * 切り替わり、RN core SafeAreaView deprecation 警告(RN 0.85+)も出なくなる。
14
+ * これで Screen の SafeArea が useSafeAreaInsets() + View adapter に切り替わる。
15
+ * Provider context 値を render 中に同期参照して padding を付けるため、native
16
+ * SafeAreaView の layout/state 更新を待たず、初回 render から inset が反映される。
17
+ *
18
+ * ⚠️ 前提: アプリの root に SafeAreaProvider が必要。初回 render から正しい inset を
19
+ * 使うには Provider に initialMetrics も渡す。React Navigation / Expo Router 利用時は
20
+ * Provider が設置済みのことが多い。
16
21
  */
17
- /** Screen SafeArea react-native-safe-area-context に切り替える。 */
18
- export declare function enableSafeAreaContext(): void;
22
+ import { type Edge } from "react-native-safe-area-context";
23
+ /** enableSafeAreaContext() の設定。edges 省略時は従来相当の全 edge。 */
24
+ export interface EnableSafeAreaContextOptions {
25
+ /** Screen に適用する edge。tab bar 等が担当する edge は除外する。 */
26
+ edges?: readonly Edge[];
27
+ }
28
+ /** Screen の SafeArea を context 同期参照の View adapter に切り替える。 */
29
+ export declare function enableSafeAreaContext(options?: EnableSafeAreaContextOptions): void;
19
30
  //# sourceMappingURL=index.d.ts.map
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "melta-app",
3
- "version": "0.2.0",
3
+ "version": "0.2.1",
4
4
  "description": "melta for APP — melta デザインシステムの React Native UI kit。melta-contracts(デザイン契約)を single source of truth に RN 実装でその契約を満たす。アプリ本体ではなくライブラリ。",
5
5
  "license": "MIT",
6
6
  "homepage": "https://app.melta.tsubotax.com",
@@ -11,8 +11,8 @@
11
11
  * SafeArea は registry(safe-area-registry.ts)で解決する。default は RN core の
12
12
  * SafeAreaView(deprecated / iOS のみの最小対応)で依存ゼロを維持しつつ、
13
13
  * react-native-safe-area-context 利用者は subpath "melta-app/safe-area" の
14
- * enableSafeAreaContext() で差し替えられる(rally-nav dogfood 由来、RN 0.85
15
- * core SafeAreaView deprecation 警告対応)。
14
+ * enableSafeAreaContext() context hook + View adapter に差し替えられる
15
+ * (rally-nav dogfood 由来、RN 0.85 Fabric/Android の初回 inset flash 対応)。
16
16
  */
17
17
 
18
18
  import { useMemo, type ReactNode } from "react";
@@ -4,8 +4,9 @@
4
4
  * 本体エントリは依存ゼロ方針(P1)のため、default は RN core の SafeAreaView
5
5
  * (deprecated / iOS のみの最小対応)。react-native-safe-area-context を使う利用者は
6
6
  * subpath "melta-app/safe-area" の enableSafeAreaContext() をアプリ起動時に一度呼ぶと
7
- * Screen の SafeArea が差し替わる(optional peer の前例 = Icon × react-native-svg。
8
- * ただし Screen は本体エントリ所属のため subpath 分離ではなく registry で切り替える)。
7
+ * Screen の SafeArea が context hook + View adapter に差し替わる(optional peer の前例 =
8
+ * Icon × react-native-svg。ただし Screen は本体エントリ所属のため subpath 分離ではなく
9
+ * registry で切り替える)。
9
10
  *
10
11
  * ⚠️ RN 0.85 は react-native の SafeAreaView プロパティへの getter アクセス時点で
11
12
  * deprecation 警告を出す。adapter 登録済みの利用者に警告を出さないため、core への
@@ -11,18 +11,77 @@
11
11
  * import { enableSafeAreaContext } from "melta-app/safe-area";
12
12
  * enableSafeAreaContext();
13
13
  *
14
- * これで Screen の SafeArea が react-native-safe-area-contextSafeAreaView
15
- * 切り替わり、RN core SafeAreaView deprecation 警告(RN 0.85+)も出なくなる。
14
+ * これで Screen の SafeArea が useSafeAreaInsets() + View adapter に切り替わる。
15
+ * Provider context 値を render 中に同期参照して padding を付けるため、native
16
+ * SafeAreaView の layout/state 更新を待たず、初回 render から inset が反映される。
16
17
  *
17
- * ⚠️ 前提: アプリの root に SafeAreaProvider が必要(context SafeAreaView
18
- * nearest provider から inset を取る。無いと inset が効かない)。React Navigation /
19
- * Expo Router 利用時は設置済みのことが多い。
18
+ * ⚠️ 前提: アプリの root に SafeAreaProvider が必要。初回 render から正しい inset を
19
+ * 使うには Provider initialMetrics も渡す。React Navigation / Expo Router 利用時は
20
+ * Provider が設置済みのことが多い。
20
21
  */
21
22
 
22
- import { SafeAreaView } from "react-native-safe-area-context";
23
- import { setSafeAreaView } from "../components/safe-area-registry";
23
+ import { createElement, useMemo } from "react";
24
+ import { StyleSheet, View, type ViewStyle } from "react-native";
25
+ import {
26
+ useSafeAreaInsets,
27
+ type Edge,
28
+ type EdgeInsets,
29
+ } from "react-native-safe-area-context";
30
+ import {
31
+ setSafeAreaView,
32
+ type SafeAreaViewLike,
33
+ type SafeAreaViewLikeProps,
34
+ } from "../components/safe-area-registry";
24
35
 
25
- /** Screen SafeArea react-native-safe-area-context に切り替える。 */
26
- export function enableSafeAreaContext(): void {
27
- setSafeAreaView(SafeAreaView);
36
+ const ALL_EDGES = ["top", "right", "bottom", "left"] as const satisfies readonly Edge[];
37
+
38
+ /** enableSafeAreaContext() の設定。edges 省略時は従来相当の全 edge。 */
39
+ export interface EnableSafeAreaContextOptions {
40
+ /** Screen に適用する edge。tab bar 等が担当する edge は除外する。 */
41
+ edges?: readonly Edge[];
42
+ }
43
+
44
+ function additivePadding(
45
+ style: SafeAreaViewLikeProps["style"],
46
+ insets: EdgeInsets,
47
+ edges: ReadonlySet<Edge>,
48
+ ): ViewStyle {
49
+ const flat = StyleSheet.flatten(style) ?? {};
50
+
51
+ const base = (edge: Edge): number => {
52
+ const edgeValue = flat[`padding${edge[0].toUpperCase()}${edge.slice(1)}` as keyof ViewStyle];
53
+ const axisValue =
54
+ edge === "top" || edge === "bottom" ? flat.paddingVertical : flat.paddingHorizontal;
55
+ const value = edgeValue ?? axisValue ?? flat.padding;
56
+ return typeof value === "number" ? value : 0;
57
+ };
58
+
59
+ return {
60
+ ...(edges.has("top") ? { paddingTop: base("top") + insets.top } : null),
61
+ ...(edges.has("right") ? { paddingRight: base("right") + insets.right } : null),
62
+ ...(edges.has("bottom") ? { paddingBottom: base("bottom") + insets.bottom } : null),
63
+ ...(edges.has("left") ? { paddingLeft: base("left") + insets.left } : null),
64
+ };
65
+ }
66
+
67
+ function createContextSafeAreaView(selectedEdges: readonly Edge[]): SafeAreaViewLike {
68
+ const edges = new Set(selectedEdges);
69
+
70
+ function ContextSafeAreaView({ style, ...props }: SafeAreaViewLikeProps) {
71
+ const insets = useSafeAreaInsets();
72
+ const paddingStyle = useMemo(
73
+ () => additivePadding(style, insets, edges),
74
+ [style, insets.top, insets.right, insets.bottom, insets.left],
75
+ );
76
+
77
+ return createElement(View, { ...props, style: [style, paddingStyle] });
78
+ }
79
+
80
+ ContextSafeAreaView.displayName = "MeltaContextSafeAreaView";
81
+ return ContextSafeAreaView;
82
+ }
83
+
84
+ /** Screen の SafeArea を context 同期参照の View adapter に切り替える。 */
85
+ export function enableSafeAreaContext(options: EnableSafeAreaContextOptions = {}): void {
86
+ setSafeAreaView(createContextSafeAreaView(options.edges ?? ALL_EDGES));
28
87
  }