bootstrap-rn 0.4.5 → 0.4.6
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.
- package/lib/module/components/Body.js +2 -4
- package/lib/module/components/Body.js.map +1 -1
- package/lib/module/components/SafeAreaView.js +1 -3
- package/lib/module/components/SafeAreaView.js.map +1 -1
- package/lib/module/components/modal/Modal.js +5 -4
- package/lib/module/components/modal/Modal.js.map +1 -1
- package/lib/module/components/offcanvas/Offcanvas.js +7 -8
- package/lib/module/components/offcanvas/Offcanvas.js.map +1 -1
- package/lib/typescript/components/Body.d.ts +2 -2
- package/lib/typescript/components/Body.d.ts.map +1 -1
- package/lib/typescript/components/SafeAreaView.d.ts +4 -5
- package/lib/typescript/components/SafeAreaView.d.ts.map +1 -1
- package/lib/typescript/components/modal/Modal.d.ts.map +1 -1
- package/lib/typescript/components/offcanvas/Offcanvas.d.ts.map +1 -1
- package/package.json +1 -3
- package/src/components/Body.tsx +6 -21
- package/src/components/SafeAreaView.tsx +5 -12
- package/src/components/modal/Modal.tsx +5 -3
- package/src/components/offcanvas/Offcanvas.tsx +10 -12
|
@@ -7,7 +7,7 @@ import { getStyles } from "../utils.js";
|
|
|
7
7
|
import TextStyleContext from "../style/TextStyleContext.js";
|
|
8
8
|
import useMedia from "../hooks/useMedia.js";
|
|
9
9
|
import useStyle from "../hooks/useStyle.js";
|
|
10
|
-
import
|
|
10
|
+
import View from "./View.js";
|
|
11
11
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
12
12
|
const styles = StyleSheet.create({
|
|
13
13
|
body: css`
|
|
@@ -23,7 +23,6 @@ const styles = StyleSheet.create({
|
|
|
23
23
|
const Body = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
24
24
|
const {
|
|
25
25
|
children,
|
|
26
|
-
edges = ['top', 'left', 'right'],
|
|
27
26
|
style,
|
|
28
27
|
textStyle,
|
|
29
28
|
styleName,
|
|
@@ -39,10 +38,9 @@ const Body = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
39
38
|
media
|
|
40
39
|
})
|
|
41
40
|
}), [resolveTextStyle, media]);
|
|
42
|
-
return /*#__PURE__*/_jsx(
|
|
41
|
+
return /*#__PURE__*/_jsx(View, {
|
|
43
42
|
...elementProps,
|
|
44
43
|
ref: ref,
|
|
45
|
-
edges: edges,
|
|
46
44
|
style: resolveStyle({
|
|
47
45
|
media
|
|
48
46
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useMemo","StyleSheet","css","getStyles","TextStyleContext","useMedia","useStyle","
|
|
1
|
+
{"version":3,"names":["React","useMemo","StyleSheet","css","getStyles","TextStyleContext","useMedia","useStyle","View","jsx","_jsx","styles","create","body","Body","forwardRef","props","ref","children","style","textStyle","styleName","elementProps","classes","textClasses","media","resolveStyle","resolveTextStyle","contextValue","Provider","value","displayName"],"sourceRoot":"..\\..\\..\\src","sources":["components/Body.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,OAAO,QAAQ,OAAO;AACtC,OAAOC,UAAU,MAAM,wBAAqB;AAC5C,OAAOC,GAAG,MAAM,iBAAc;AAC9B,SAASC,SAAS,QAAQ,aAAU;AACpC,OAAOC,gBAAgB,MAAM,8BAA2B;AACxD,OAAOC,QAAQ,MAAM,sBAAmB;AACxC,OAAOC,QAAQ,MAAM,sBAAmB;AACxC,OAAOC,IAAI,MAA8B,WAAQ;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAIlD,MAAMC,MAAM,GAAGT,UAAU,CAACU,MAAM,CAAC;EAC/BC,IAAI,EAAEV,GAAG;AACX;AACA;AACA;AACA,GAAG;EACD,aAAa,EAAEA,GAAG;AACpB;AACA;AACA;AACA,CAAC,CAAC;AAEF,MAAMW,IAAI,gBAAGd,KAAK,CAACe,UAAU,CAAqB,CAACC,KAAK,EAAEC,GAAG,KAAK;EAChE,MAAM;IAAEC,QAAQ;IAAEC,KAAK;IAAEC,SAAS;IAAEC,SAAS;IAAE,GAAGC;EAAa,CAAC,GAAGN,KAAK;EAExE,MAAMO,OAAO,GAAGnB,SAAS,CAACO,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC;EAC3C,MAAMa,WAAW,GAAGpB,SAAS,CAACO,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC;EAEtD,MAAMc,KAAK,GAAGnB,QAAQ,CAAC,CAAC;EAExB,MAAMoB,YAAY,GAAGnB,QAAQ,CAAC,CAACgB,OAAO,EAAEJ,KAAK,CAAC,EAAEE,SAAS,CAAC;EAC1D,MAAMM,gBAAgB,GAAGpB,QAAQ,CAAC,CAACiB,WAAW,EAAEJ,SAAS,CAAC,CAAC;EAE3D,MAAMQ,YAAY,GAAG3B,OAAO,CAC1B,OAAO;IACLkB,KAAK,EAAEQ,gBAAgB,CAAC;MAAEF;IAAM,CAAC;EACnC,CAAC,CAAC,EACF,CAACE,gBAAgB,EAAEF,KAAK,CAC1B,CAAC;EAED,oBACEf,IAAA,CAACF,IAAI;IAAA,GAAKc,YAAY;IAAEL,GAAG,EAAEA,GAAI;IAACE,KAAK,EAAEO,YAAY,CAAC;MAAED;IAAM,CAAC,CAAE;IAAAP,QAAA,eAC/DR,IAAA,CAACL,gBAAgB,CAACwB,QAAQ;MAACC,KAAK,EAAEF,YAAa;MAAAV,QAAA,EAC5CA;IAAQ,CACgB;EAAC,CACxB,CAAC;AAEX,CAAC,CAAC;AAEFJ,IAAI,CAACiB,WAAW,GAAG,MAAM;AAEzB,eAAejB,IAAI","ignoreList":[]}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import React, { useContext, useMemo } from 'react';
|
|
4
|
-
import {
|
|
5
|
-
import { SafeAreaView as NativeSafeAreaView } from 'react-native-safe-area-context';
|
|
4
|
+
import { SafeAreaView as BaseSafeAreaView } from 'react-native';
|
|
6
5
|
import TextStyleContext from "../style/TextStyleContext.js";
|
|
7
6
|
import useMedia from "../hooks/useMedia.js";
|
|
8
7
|
import useStyle from "../hooks/useStyle.js";
|
|
9
8
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
10
|
-
const BaseSafeAreaView = Platform.OS === 'android' || Platform.OS === 'ios' ? NativeSafeAreaView : View;
|
|
11
9
|
const SafeAreaView = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
12
10
|
const {
|
|
13
11
|
children,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useContext","useMemo","
|
|
1
|
+
{"version":3,"names":["React","useContext","useMemo","SafeAreaView","BaseSafeAreaView","TextStyleContext","useMedia","useStyle","jsx","_jsx","forwardRef","props","ref","children","style","textStyle","styleName","elementProps","media","context","resolveStyle","resolveTextStyle","hasTextStyle","contextValue","hasAncestor","hasTextAncestor","Provider","value","displayName"],"sourceRoot":"..\\..\\..\\src","sources":["components/SafeAreaView.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAClD,SACEC,YAAY,IAAIC,gBAAgB,QAE3B,cAAc;AACrB,OAAOC,gBAAgB,MAAM,8BAA2B;AACxD,OAAOC,QAAQ,MAAM,sBAAmB;AACxC,OAAOC,QAAQ,MAAM,sBAAmB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAgBzC,MAAMN,YAAY,gBAAGH,KAAK,CAACU,UAAU,CACnC,CAACC,KAAK,EAAEC,GAAG,KAAK;EACd,MAAM;IAAEC,QAAQ;IAAEC,KAAK;IAAEC,SAAS;IAAEC,SAAS;IAAE,GAAGC;EAAa,CAAC,GAAGN,KAAK;EAExE,MAAMO,KAAK,GAAGZ,QAAQ,CAAC,CAAC;EACxB,MAAMa,OAAO,GAAGlB,UAAU,CAACI,gBAAgB,CAAC;EAE5C,MAAMe,YAAY,GAAGb,QAAQ,CAACO,KAAK,EAAEE,SAAS,CAAC;EAC/C,MAAMK,gBAAgB,GAAGd,QAAQ,CAAC,CAACY,OAAO,EAAEL,KAAK,EAAEC,SAAS,CAAC,CAAC;EAE9D,MAAMO,YAAY,GAAGH,OAAO,EAAEL,KAAK,IAAIC,SAAS;EAEhD,MAAMQ,YAAY,GAAGrB,OAAO,CAC1B,OAAO;IACLY,KAAK,EAAEO,gBAAgB,CAAC;MAAEH;IAAM,CAAC,CAAC;IAClCM,WAAW,EAAEL,OAAO,EAAEM;EACxB,CAAC,CAAC,EACF,CAACJ,gBAAgB,EAAEH,KAAK,EAAEC,OAAO,CACnC,CAAC;EAED,oBACEV,IAAA,CAACL,gBAAgB;IAAA,GACXa,YAAY;IAChBL,GAAG,EAAEA,GAAI;IACTE,KAAK,EAAEM,YAAY,CAAC;MAAEF;IAAM,CAAC,CAAE;IAAAL,QAAA,EAE9BS,YAAY,gBACXb,IAAA,CAACJ,gBAAgB,CAACqB,QAAQ;MAACC,KAAK,EAAEJ,YAAa;MAAAV,QAAA,EAC5CA;IAAQ,CACgB,CAAC,GAE5BA;EACD,CACe,CAAC;AAEvB,CACF,CAAC;AAEDV,YAAY,CAACyB,WAAW,GAAG,cAAc;AAEzC,eAAezB,YAAY","ignoreList":[]}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import React, { useRef } from 'react';
|
|
4
|
-
import { Modal as BaseModal } from 'react-native';
|
|
4
|
+
import { Modal as BaseModal, Platform } from 'react-native';
|
|
5
5
|
import { OverlayProvider } from '@react-native-aria/overlays';
|
|
6
6
|
import StyleSheet from "../../style/StyleSheet.js";
|
|
7
7
|
import { getStyles } from "../../utils.js";
|
|
@@ -146,9 +146,10 @@ const Modal = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
146
146
|
justifyContent: 'center'
|
|
147
147
|
};
|
|
148
148
|
return /*#__PURE__*/_jsxs(BaseModal, {
|
|
149
|
-
transparent: true
|
|
150
|
-
|
|
151
|
-
|
|
149
|
+
transparent: true
|
|
150
|
+
// Modal is only shown correctly on older Android versions if we set this.
|
|
151
|
+
,
|
|
152
|
+
navigationBarTranslucent: Platform.OS === 'android' && Platform.constants.Version < 35,
|
|
152
153
|
visible: visible,
|
|
153
154
|
onRequestClose: handleToggle,
|
|
154
155
|
children: [backdrop && /*#__PURE__*/_jsx(View, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useRef","Modal","BaseModal","OverlayProvider","StyleSheet","getStyles","css","ScrollView","View","BackdropHandler","SafeAreaView","useModal","ModalContext","ModalHeader","ModalTitle","ModalBody","ModalFooter","jsx","_jsx","jsxs","_jsxs","styles","create","forwardRef","props","ref","children","visible","size","backdrop","scrollable","centered","onToggle","handleToggle","style","contentContainerStyle","dialogStyle","contentStyle","textStyle","dialogTextStyle","contentTextStyle","elementProps","dialogRef","modal","backdropClasses","classes","dialogClasses","contentClasses","contentTextClasses","FlexView","centeredStyle","justifyContent","transparent","
|
|
1
|
+
{"version":3,"names":["React","useRef","Modal","BaseModal","Platform","OverlayProvider","StyleSheet","getStyles","css","ScrollView","View","BackdropHandler","SafeAreaView","useModal","ModalContext","ModalHeader","ModalTitle","ModalBody","ModalFooter","jsx","_jsx","jsxs","_jsxs","styles","create","forwardRef","props","ref","children","visible","size","backdrop","scrollable","centered","onToggle","handleToggle","style","contentContainerStyle","dialogStyle","contentStyle","textStyle","dialogTextStyle","contentTextStyle","elementProps","dialogRef","modal","backdropClasses","classes","dialogClasses","contentClasses","contentTextClasses","FlexView","centeredStyle","justifyContent","transparent","navigationBarTranslucent","OS","constants","Version","onRequestClose","undefined","flexGrow","onClose","flexShrink","Provider","value","displayName","Object","assign","Context","Header","Title","Body","Footer"],"sourceRoot":"..\\..\\..\\..\\src","sources":["components/modal/Modal.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import React, { useContext, useRef } from 'react';
|
|
4
|
-
import { Modal as BaseModal } from 'react-native';
|
|
4
|
+
import { Modal as BaseModal, Platform } from 'react-native';
|
|
5
5
|
import { OverlayProvider } from '@react-native-aria/overlays';
|
|
6
6
|
import StyleSheet from "../../style/StyleSheet.js";
|
|
7
7
|
import css from "../../style/css.js";
|
|
@@ -160,15 +160,15 @@ const Offcanvas = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
160
160
|
});
|
|
161
161
|
}
|
|
162
162
|
return /*#__PURE__*/_jsxs(BaseModal, {
|
|
163
|
-
transparent: true
|
|
164
|
-
|
|
165
|
-
|
|
163
|
+
transparent: true
|
|
164
|
+
// Modal is only shown correctly on older Android versions if we set this.
|
|
165
|
+
,
|
|
166
|
+
navigationBarTranslucent: Platform.OS === 'android' && Platform.constants.Version < 35,
|
|
166
167
|
visible: navbar ? navbar.expanded : visible,
|
|
167
168
|
onRequestClose: handleToggle,
|
|
168
169
|
children: [backdrop && /*#__PURE__*/_jsx(SafeAreaView, {
|
|
169
170
|
style: backdropClasses,
|
|
170
|
-
|
|
171
|
-
children: /*#__PURE__*/_jsx(SafeAreaView, {
|
|
171
|
+
children: /*#__PURE__*/_jsx(View, {
|
|
172
172
|
style: [{
|
|
173
173
|
flexGrow: 1
|
|
174
174
|
}, backdropInsetClasses],
|
|
@@ -183,8 +183,7 @@ const Offcanvas = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
183
183
|
ref: concatRefs(offcanvasRef, ref),
|
|
184
184
|
style: [classes, style],
|
|
185
185
|
textStyle: [textClasses, textStyle],
|
|
186
|
-
|
|
187
|
-
children: /*#__PURE__*/_jsx(SafeAreaView, {
|
|
186
|
+
children: /*#__PURE__*/_jsx(View, {
|
|
188
187
|
style: [{
|
|
189
188
|
flexGrow: 1
|
|
190
189
|
}, dialogClasses, dialogStyle],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useContext","useRef","Modal","BaseModal","OverlayProvider","StyleSheet","css","BackdropHandler","SafeAreaView","View","GRID_BREAKPOINTS","infix","next","getStyles","each","concatRefs","useMedia","NavbarContext","useOffcanvas","OffcanvasContext","OffcanvasHeader","OffcanvasTitle","OffcanvasBody","jsx","_jsx","jsxs","_jsxs","styles","create","breakpoint","Offcanvas","forwardRef","props","ref","children","visible","placement","backdrop","scroll","onToggle","handleToggle","style","dialogStyle","textStyle","dialogTextStyle","elementProps","media","navbar","offcanvasRef","offcanvas","backdropClasses","backdropInsetClasses","classes","expand","dialogClasses","textClasses","up","transparent","
|
|
1
|
+
{"version":3,"names":["React","useContext","useRef","Modal","BaseModal","Platform","OverlayProvider","StyleSheet","css","BackdropHandler","SafeAreaView","View","GRID_BREAKPOINTS","infix","next","getStyles","each","concatRefs","useMedia","NavbarContext","useOffcanvas","OffcanvasContext","OffcanvasHeader","OffcanvasTitle","OffcanvasBody","jsx","_jsx","jsxs","_jsxs","styles","create","breakpoint","Offcanvas","forwardRef","props","ref","children","visible","placement","backdrop","scroll","onToggle","handleToggle","style","dialogStyle","textStyle","dialogTextStyle","elementProps","media","navbar","offcanvasRef","offcanvas","backdropClasses","backdropInsetClasses","classes","expand","dialogClasses","textClasses","up","transparent","navigationBarTranslucent","OS","constants","Version","expanded","onRequestClose","flexGrow","dialogRef","onClose","Provider","value","displayName","Object","assign","Context","Header","Title","Body"],"sourceRoot":"..\\..\\..\\..\\src","sources":["components/offcanvas/Offcanvas.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import {
|
|
3
|
-
export interface BodyProps extends
|
|
2
|
+
import { ViewProps } from './View';
|
|
3
|
+
export interface BodyProps extends ViewProps {
|
|
4
4
|
}
|
|
5
5
|
declare const Body: React.ForwardRefExoticComponent<BodyProps & React.RefAttributes<import("react-native").View>>;
|
|
6
6
|
export default Body;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Body.d.ts","sourceRoot":"","sources":["../../../src/components/Body.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAOvC,
|
|
1
|
+
{"version":3,"file":"Body.d.ts","sourceRoot":"","sources":["../../../src/components/Body.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAOvC,OAAa,EAAE,SAAS,EAAW,MAAM,QAAQ,CAAC;AAElD,MAAM,WAAW,SAAU,SAAQ,SAAS;CAAG;AAc/C,QAAA,MAAM,IAAI,+FAyBR,CAAC;AAIH,eAAe,IAAI,CAAC"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import {
|
|
3
|
-
import { SafeAreaViewProps as NativeSafeAreaViewProps } from 'react-native-safe-area-context';
|
|
2
|
+
import { SafeAreaView as BaseSafeAreaView, ViewProps as BaseViewProps } from 'react-native';
|
|
4
3
|
import type { ExtendedTextStyle, StyleName, StyleProp, ExtendedViewStyle } from '../types';
|
|
5
|
-
export type SafeAreaViewRef =
|
|
6
|
-
export interface SafeAreaViewProps extends Omit<
|
|
4
|
+
export type SafeAreaViewRef = BaseSafeAreaView;
|
|
5
|
+
export interface SafeAreaViewProps extends Omit<BaseViewProps, 'style'> {
|
|
7
6
|
style?: StyleProp<ExtendedViewStyle>;
|
|
8
7
|
textStyle?: StyleProp<ExtendedTextStyle>;
|
|
9
8
|
styleName?: StyleName;
|
|
10
9
|
}
|
|
11
|
-
declare const SafeAreaView: React.ForwardRefExoticComponent<SafeAreaViewProps & React.RefAttributes<
|
|
10
|
+
declare const SafeAreaView: React.ForwardRefExoticComponent<SafeAreaViewProps & React.RefAttributes<BaseSafeAreaView>>;
|
|
12
11
|
export default SafeAreaView;
|
|
13
12
|
//# sourceMappingURL=SafeAreaView.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SafeAreaView.d.ts","sourceRoot":"","sources":["../../../src/components/SafeAreaView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,
|
|
1
|
+
{"version":3,"file":"SafeAreaView.d.ts","sourceRoot":"","sources":["../../../src/components/SafeAreaView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,EACL,YAAY,IAAI,gBAAgB,EAChC,SAAS,IAAI,aAAa,EAC3B,MAAM,cAAc,CAAC;AAItB,OAAO,KAAK,EACV,iBAAiB,EACjB,SAAS,EACT,SAAS,EACT,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAElB,MAAM,MAAM,eAAe,GAAG,gBAAgB,CAAC;AAE/C,MAAM,WAAW,iBAAkB,SAAQ,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC;IACrE,KAAK,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IACzC,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,QAAA,MAAM,YAAY,4FAoCjB,CAAC;AAIF,eAAe,YAAY,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Modal.d.ts","sourceRoot":"","sources":["../../../../src/components/modal/Modal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAC;AAMtC,OAAmB,EAAiB,eAAe,EAAE,MAAM,eAAe,CAAC;AAU3E,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE9E,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC5C,eAAe,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC/C,gBAAgB,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;CACjD;;;;;;;;
|
|
1
|
+
{"version":3,"file":"Modal.d.ts","sourceRoot":"","sources":["../../../../src/components/modal/Modal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAC;AAMtC,OAAmB,EAAiB,eAAe,EAAE,MAAM,eAAe,CAAC;AAU3E,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE9E,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC5C,eAAe,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC/C,gBAAgB,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;CACjD;;;;;;;;AA+MD,wBAMG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Offcanvas.d.ts","sourceRoot":"","sources":["../../../../src/components/offcanvas/Offcanvas.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAOlD,OAAa,EAAE,SAAS,EAAW,MAAM,SAAS,CAAC;AAWnD,OAAO,KAAK,EACV,iBAAiB,EACjB,iBAAiB,EACjB,SAAS,EACV,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,cAAe,SAAQ,SAAS;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;IAC/C,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC3C,eAAe,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;CAChD;;;;;;;
|
|
1
|
+
{"version":3,"file":"Offcanvas.d.ts","sourceRoot":"","sources":["../../../../src/components/offcanvas/Offcanvas.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAOlD,OAAa,EAAE,SAAS,EAAW,MAAM,SAAS,CAAC;AAWnD,OAAO,KAAK,EACV,iBAAiB,EACjB,iBAAiB,EACjB,SAAS,EACV,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,cAAe,SAAQ,SAAS;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;IAC/C,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC3C,eAAe,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;CAChD;;;;;;;AA+MD,wBAKG"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "bootstrap-rn",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.6",
|
|
4
4
|
"description": "Bootstrap RN provides Bootstrap components for React Native.",
|
|
5
5
|
"author": "Markus Wetzel <markuswetzel@gmx.net>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -44,7 +44,6 @@
|
|
|
44
44
|
"react-dom": "19.0.0",
|
|
45
45
|
"react-native": "0.79.2",
|
|
46
46
|
"react-native-builder-bob": "^0.40.10",
|
|
47
|
-
"react-native-safe-area-context": "5.4.0",
|
|
48
47
|
"react-native-svg": "15.11.2",
|
|
49
48
|
"react-native-web": "^0.20.0",
|
|
50
49
|
"typescript": "~5.8.3"
|
|
@@ -54,7 +53,6 @@
|
|
|
54
53
|
"react": ">=17",
|
|
55
54
|
"react-dom": ">=17",
|
|
56
55
|
"react-native": ">=0.63.0",
|
|
57
|
-
"react-native-safe-area-context": ">=5",
|
|
58
56
|
"react-native-svg": ">=12.3.0"
|
|
59
57
|
},
|
|
60
58
|
"peerDependenciesMeta": {
|
package/src/components/Body.tsx
CHANGED
|
@@ -5,12 +5,9 @@ import { getStyles } from '../utils';
|
|
|
5
5
|
import TextStyleContext from '../style/TextStyleContext';
|
|
6
6
|
import useMedia from '../hooks/useMedia';
|
|
7
7
|
import useStyle from '../hooks/useStyle';
|
|
8
|
-
import
|
|
9
|
-
SafeAreaViewProps,
|
|
10
|
-
SafeAreaViewRef,
|
|
11
|
-
} from './SafeAreaView';
|
|
8
|
+
import View, { ViewProps, ViewRef } from './View';
|
|
12
9
|
|
|
13
|
-
export interface BodyProps extends
|
|
10
|
+
export interface BodyProps extends ViewProps {}
|
|
14
11
|
|
|
15
12
|
const styles = StyleSheet.create({
|
|
16
13
|
body: css`
|
|
@@ -24,15 +21,8 @@ const styles = StyleSheet.create({
|
|
|
24
21
|
`,
|
|
25
22
|
});
|
|
26
23
|
|
|
27
|
-
const Body = React.forwardRef<
|
|
28
|
-
const {
|
|
29
|
-
children,
|
|
30
|
-
edges = ['top', 'left', 'right'],
|
|
31
|
-
style,
|
|
32
|
-
textStyle,
|
|
33
|
-
styleName,
|
|
34
|
-
...elementProps
|
|
35
|
-
} = props;
|
|
24
|
+
const Body = React.forwardRef<ViewRef, BodyProps>((props, ref) => {
|
|
25
|
+
const { children, style, textStyle, styleName, ...elementProps } = props;
|
|
36
26
|
|
|
37
27
|
const classes = getStyles(styles, ['body']);
|
|
38
28
|
const textClasses = getStyles(styles, ['body --text']);
|
|
@@ -50,16 +40,11 @@ const Body = React.forwardRef<SafeAreaViewRef, BodyProps>((props, ref) => {
|
|
|
50
40
|
);
|
|
51
41
|
|
|
52
42
|
return (
|
|
53
|
-
<
|
|
54
|
-
{...elementProps}
|
|
55
|
-
ref={ref}
|
|
56
|
-
edges={edges}
|
|
57
|
-
style={resolveStyle({ media })}
|
|
58
|
-
>
|
|
43
|
+
<View {...elementProps} ref={ref} style={resolveStyle({ media })}>
|
|
59
44
|
<TextStyleContext.Provider value={contextValue}>
|
|
60
45
|
{children}
|
|
61
46
|
</TextStyleContext.Provider>
|
|
62
|
-
</
|
|
47
|
+
</View>
|
|
63
48
|
);
|
|
64
49
|
});
|
|
65
50
|
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import React, { useContext, useMemo } from 'react';
|
|
2
|
-
import { Platform, View } from 'react-native';
|
|
3
2
|
import {
|
|
4
|
-
SafeAreaView as
|
|
5
|
-
|
|
6
|
-
} from 'react-native
|
|
3
|
+
SafeAreaView as BaseSafeAreaView,
|
|
4
|
+
ViewProps as BaseViewProps,
|
|
5
|
+
} from 'react-native';
|
|
7
6
|
import TextStyleContext from '../style/TextStyleContext';
|
|
8
7
|
import useMedia from '../hooks/useMedia';
|
|
9
8
|
import useStyle from '../hooks/useStyle';
|
|
@@ -14,20 +13,14 @@ import type {
|
|
|
14
13
|
ExtendedViewStyle,
|
|
15
14
|
} from '../types';
|
|
16
15
|
|
|
17
|
-
export type SafeAreaViewRef =
|
|
16
|
+
export type SafeAreaViewRef = BaseSafeAreaView;
|
|
18
17
|
|
|
19
|
-
export interface SafeAreaViewProps
|
|
20
|
-
extends Omit<NativeSafeAreaViewProps, 'style'> {
|
|
18
|
+
export interface SafeAreaViewProps extends Omit<BaseViewProps, 'style'> {
|
|
21
19
|
style?: StyleProp<ExtendedViewStyle>;
|
|
22
20
|
textStyle?: StyleProp<ExtendedTextStyle>;
|
|
23
21
|
styleName?: StyleName;
|
|
24
22
|
}
|
|
25
23
|
|
|
26
|
-
const BaseSafeAreaView =
|
|
27
|
-
Platform.OS === 'android' || Platform.OS === 'ios'
|
|
28
|
-
? NativeSafeAreaView
|
|
29
|
-
: View;
|
|
30
|
-
|
|
31
24
|
const SafeAreaView = React.forwardRef<SafeAreaViewRef, SafeAreaViewProps>(
|
|
32
25
|
(props, ref) => {
|
|
33
26
|
const { children, style, textStyle, styleName, ...elementProps } = props;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { useRef } from 'react';
|
|
2
|
-
import { Modal as BaseModal } from 'react-native';
|
|
2
|
+
import { Modal as BaseModal, Platform } from 'react-native';
|
|
3
3
|
import { OverlayProvider } from '@react-native-aria/overlays';
|
|
4
4
|
import StyleSheet from '../../style/StyleSheet';
|
|
5
5
|
import { getStyles } from '../../utils';
|
|
@@ -185,8 +185,10 @@ const Modal = React.forwardRef<ViewRef | ScrollViewRef, ModalProps>(
|
|
|
185
185
|
return (
|
|
186
186
|
<BaseModal
|
|
187
187
|
transparent
|
|
188
|
-
|
|
189
|
-
navigationBarTranslucent
|
|
188
|
+
// Modal is only shown correctly on older Android versions if we set this.
|
|
189
|
+
navigationBarTranslucent={
|
|
190
|
+
Platform.OS === 'android' && Platform.constants.Version < 35
|
|
191
|
+
}
|
|
190
192
|
visible={visible}
|
|
191
193
|
onRequestClose={handleToggle}
|
|
192
194
|
>
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { useContext, useRef } from 'react';
|
|
2
|
-
import { Modal as BaseModal } from 'react-native';
|
|
2
|
+
import { Modal as BaseModal, Platform } from 'react-native';
|
|
3
3
|
import { OverlayProvider } from '@react-native-aria/overlays';
|
|
4
4
|
import StyleSheet from '../../style/StyleSheet';
|
|
5
5
|
import css from '../../style/css';
|
|
@@ -198,23 +198,22 @@ const Offcanvas = React.forwardRef<ViewRef, OffcanvasProps>((props, ref) => {
|
|
|
198
198
|
return (
|
|
199
199
|
<BaseModal
|
|
200
200
|
transparent
|
|
201
|
-
|
|
202
|
-
navigationBarTranslucent
|
|
201
|
+
// Modal is only shown correctly on older Android versions if we set this.
|
|
202
|
+
navigationBarTranslucent={
|
|
203
|
+
Platform.OS === 'android' && Platform.constants.Version < 35
|
|
204
|
+
}
|
|
203
205
|
visible={navbar ? navbar.expanded : visible}
|
|
204
206
|
onRequestClose={handleToggle}
|
|
205
207
|
>
|
|
206
208
|
{backdrop && (
|
|
207
|
-
<SafeAreaView
|
|
208
|
-
style={
|
|
209
|
-
edges={placement !== 'bottom' ? ['top'] : []}
|
|
210
|
-
>
|
|
211
|
-
<SafeAreaView style={[{ flexGrow: 1 }, backdropInsetClasses]}>
|
|
209
|
+
<SafeAreaView style={backdropClasses}>
|
|
210
|
+
<View style={[{ flexGrow: 1 }, backdropInsetClasses]}>
|
|
212
211
|
<BackdropHandler
|
|
213
212
|
dialogRef={offcanvasRef}
|
|
214
213
|
onClose={handleToggle}
|
|
215
214
|
backdrop={backdrop}
|
|
216
215
|
/>
|
|
217
|
-
</
|
|
216
|
+
</View>
|
|
218
217
|
</SafeAreaView>
|
|
219
218
|
)}
|
|
220
219
|
<SafeAreaView
|
|
@@ -222,16 +221,15 @@ const Offcanvas = React.forwardRef<ViewRef, OffcanvasProps>((props, ref) => {
|
|
|
222
221
|
ref={concatRefs(offcanvasRef, ref)}
|
|
223
222
|
style={[classes, style]}
|
|
224
223
|
textStyle={[textClasses, textStyle]}
|
|
225
|
-
edges={placement !== 'bottom' ? ['top'] : []}
|
|
226
224
|
>
|
|
227
|
-
<
|
|
225
|
+
<View
|
|
228
226
|
style={[{ flexGrow: 1 }, dialogClasses, dialogStyle]}
|
|
229
227
|
textStyle={dialogTextStyle}
|
|
230
228
|
>
|
|
231
229
|
<OffcanvasContext.Provider value={offcanvas}>
|
|
232
230
|
<OverlayProvider>{children}</OverlayProvider>
|
|
233
231
|
</OffcanvasContext.Provider>
|
|
234
|
-
</
|
|
232
|
+
</View>
|
|
235
233
|
</SafeAreaView>
|
|
236
234
|
</BaseModal>
|
|
237
235
|
);
|