Skip to content

Commit 0761194

Browse files
authored
Merge branch 'master' into master
2 parents dfc25a8 + fdf14ac commit 0761194

File tree

119 files changed

+22364
-16054
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+22364
-16054
lines changed

app/examples.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
import React from 'react';
33
import {
44
Linking,
5-
SafeAreaView,
65
ScrollView,
76
StatusBar,
87
StyleSheet,
98
Text,
109
TouchableOpacity,
1110
} from 'react-native';
1211
import {SheetManager} from 'react-native-actions-sheet';
12+
import {SafeAreaView} from 'react-native-safe-area-context';
1313

1414
const MainScreen = () => {
1515
const examples: {

app/sheets.ts

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import {RouteDefinition, SheetDefinition, registerSheet} from 'react-native-actions-sheet';
1+
import {
2+
RouteDefinition,
3+
SheetDefinition,
4+
registerSheet,
5+
} from 'react-native-actions-sheet';
26
import Hello from './examples/hello';
37
import Gestures from './examples/gestures';
48
import SnapMe from './examples/snap-me';
@@ -15,7 +19,6 @@ import RouterSheet from './examples/router';
1519
import DrawUnderStatusBar from './examples/draw-under-statusbar';
1620
import ReturnData from './examples/return-data';
1721

18-
1922
// Register your Sheet component.
2023
/**
2124
* Registering the sheets here because otherwise sheet closes on
@@ -28,12 +31,12 @@ registerSheet('input', Input);
2831
registerSheet('payload', Payload);
2932
registerSheet('background-interaction', BackgroundInteraction);
3033
registerSheet('always-open', AlwaysOpen);
31-
registerSheet("scrollview", ScrollViewSheet);
32-
registerSheet('flatlist', FlatListSheet)
33-
registerSheet('flashlist', FlashListSheet)
34+
registerSheet('scrollview', ScrollViewSheet);
35+
registerSheet('flatlist', FlatListSheet);
36+
registerSheet('flashlist', FlashListSheet);
3437
registerSheet('scrollview-resize', ResizeSheet);
35-
registerSheet("nested-sheets", NestedSheet);
36-
registerSheet("sheet-router", RouterSheet);
38+
registerSheet('nested-sheets', NestedSheet);
39+
registerSheet('sheet-router', RouterSheet);
3740
registerSheet('draw-under-statusbar', DrawUnderStatusBar);
3841
registerSheet('return-data', ReturnData);
3942

@@ -56,25 +59,24 @@ declare module 'react-native-actions-sheet' {
5659
};
5760
}>;
5861
'background-interaction': SheetDefinition;
59-
'always-open': SheetDefinition,
60-
'scrollview': SheetDefinition,
61-
'flatlist': SheetDefinition,
62-
'flashlist': SheetDefinition,
63-
'scrollview-resize': SheetDefinition,
62+
'always-open': SheetDefinition;
63+
scrollview: SheetDefinition;
64+
flatlist: SheetDefinition;
65+
flashlist: SheetDefinition;
66+
'scrollview-resize': SheetDefinition;
6467
'sheet-router': SheetDefinition<{
6568
routes: {
6669
'route-a': RouteDefinition;
6770
'route-b': RouteDefinition<{
68-
value: string
71+
value: string;
6972
}>;
70-
}
73+
};
7174
}>;
7275
'nested-sheets': SheetDefinition;
7376
'draw-under-statusbar': SheetDefinition;
7477
'return-data': SheetDefinition<{
75-
returnValue: boolean
76-
}>,
77-
78+
returnValue: boolean;
79+
}>;
7880
}
7981
}
8082

docs/pages/guides/sheetrouter.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Finally register the sheet along with routes in `sheets.tsx` file.
7373
import {registerSheet} from 'react-native-actions-sheet';
7474
import {SheetWithRouter} from './sheet-with-router';
7575

76-
registerSheet('sheet-with-router', Sheet);
76+
registerSheet('sheet-with-router', SheetWithRouter);
7777

7878
declare module 'react-native-actions-sheet' {
7979
interface Sheets {

docs/pages/reference/actionsheet.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Controls whether the gestures should be enabled on the action sheet.
5050
| ------- | -------- |
5151
| boolean | no |
5252

53-
Default: `true`
53+
Default: `false`
5454

5555
## `isModal`
5656

docs/pages/reference/sheetprovider.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Props:
88

99
## `context`
1010

11-
When you want to show action sheet from a modal, you must create a new `SheetProvider` inside the modal with a unique context id. Than you have to register the action sheet you want to show with that context id.
11+
When you want to show action sheet from a modal, you must create a new `SheetProvider` inside the modal with a unique context id. Then you have to register the action sheet you want to show with that context id.
1212

1313
```ts
1414
// Normal action sheet that is used with the global sheet provider.

example/.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
module.exports = {
22
root: true,
33
extends: '@react-native',
4-
r,
54
};

example/.gitignore

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23-
ios/.xcode.env.local
23+
**/.xcode.env.local
2424

2525
# Android/IntelliJ
2626
#
@@ -33,6 +33,7 @@ local.properties
3333
.cxx/
3434
*.keystore
3535
!debug.keystore
36+
.kotlin/
3637

3738
# node.js
3839
#
@@ -56,11 +57,19 @@ yarn-error.log
5657
*.jsbundle
5758

5859
# Ruby / CocoaPods
59-
/ios/Pods/
60+
**/Pods/
6061
/vendor/bundle/
6162

6263
# Temporary files created by Metro to check the health of the file watcher
6364
.metro-health-check*
6465

6566
# testing
6667
/coverage
68+
69+
# Yarn
70+
.yarn/*
71+
!.yarn/patches
72+
!.yarn/plugins
73+
!.yarn/releases
74+
!.yarn/sdks
75+
!.yarn/versions

example/.prettierrc.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
module.exports = {
22
arrowParens: 'avoid',
3-
bracketSameLine: true,
4-
bracketSpacing: false,
53
singleQuote: true,
64
trailingComma: 'all',
75
};

example/App.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from 'react';
2-
import {SheetProvider} from 'react-native-actions-sheet';
3-
import {GestureHandlerRootView} from 'react-native-gesture-handler';
2+
import { SheetProvider } from 'react-native-actions-sheet';
3+
import { GestureHandlerRootView } from 'react-native-gesture-handler';
44
import changeNavigationBarColor from 'react-native-navigation-bar-color';
55
import MainScreen from '../app/examples';
66
import '../app/sheets';
7-
import {SafeAreaProvider} from 'react-native-safe-area-context';
7+
import { SafeAreaProvider } from 'react-native-safe-area-context';
88

99
const App = () => {
1010
// To match the style of action sheet navigation bar, we use react-native-navigation-bar-color on android and the app.
@@ -18,7 +18,8 @@ const App = () => {
1818
<GestureHandlerRootView
1919
style={{
2020
flex: 1,
21-
}}>
21+
}}
22+
>
2223
<SheetProvider context="global">
2324
<MainScreen />
2425
</SheetProvider>

example/Gemfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,14 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
gem 'cocoapods', '~> 1.13'
7-
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'
11+
12+
# Ruby 3.4.0 has removed some libraries from the standard library.
13+
gem 'bigdecimal'
14+
gem 'logger'
15+
gem 'benchmark'
16+
gem 'mutex_m'

0 commit comments

Comments
 (0)