Skip to content

Commit 4cc3552

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/node-forge-1.3.2
2 parents f6cc2ce + a553b96 commit 4cc3552

File tree

5 files changed

+35
-9
lines changed

5 files changed

+35
-9
lines changed

.github/workflows/release.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
name: Release & Publish to NPM
22

3-
on: workflow_dispatch
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
release-type:
7+
description: "Release type"
8+
required: true
9+
default: "preview"
10+
type: choice
11+
options:
12+
- patch
13+
- minor
14+
- major
15+
- preview
416

517
permissions:
618
contents: write
@@ -31,7 +43,11 @@ jobs:
3143

3244
- name: Run release
3345
run: |
34-
yarn release --ci --preRelease=preview
46+
if [ "${{ inputs.release-type }}" = "preview" ]; then
47+
yarn release --ci --preRelease=preview
48+
else
49+
yarn release --ci --increment=${{ inputs.release-type }}
50+
fi
3551
env:
3652
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3753
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export default function App() {
117117
return (
118118
<MyView className="container">
119119
<MyView className="box" />
120-
</View>
120+
</MyView>
121121
);
122122
}
123123
```

package.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-css",
3-
"version": "3.0.1",
3+
"version": "3.0.3",
44
"description": "A CSS polyfill for React Native",
55
"exports": {
66
".": {
@@ -47,6 +47,18 @@
4747
"types": "./dist/typescript/commonjs/src/components/index.d.ts"
4848
}
4949
},
50+
"./components/react-native-safe-area-context": {
51+
"source": "./src/components/react-native-safe-area-context.native.tsx",
52+
"react-native": "./src/components/react-native-safe-area-context.native.tsx",
53+
"import": {
54+
"types": "./dist/typescript/module/src/components/react-native-safe-area-context.d.ts",
55+
"default": "./dist/module/components/react-native-safe-area-context.js"
56+
},
57+
"require": {
58+
"types": "./dist/typescript/commonjs/src/components/react-native-safe-area-context.d.ts",
59+
"default": "./dist/commonjs/components/react-native-safe-area-context.js"
60+
}
61+
},
5062
"./components/*": {
5163
"source": "./src/components/*.tsx",
5264
"react-native": "./src/components/*.tsx",

src/__tests__/native/env.test.ios.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
// import { SafeAreaProvider } from "react-native-css/components/SafeAreaProvider";
21
import { render, screen } from "@testing-library/react-native";
2+
import { SafeAreaProvider } from "react-native-css/components/SafeAreaProvider";
33
import { View } from "react-native-css/components/View";
44
import { registerCSS, testID } from "react-native-css/jest";
55

6-
test.skip("safe-area-inset-*", () => {
6+
test("safe-area-inset-*", () => {
77
registerCSS(`.my-class {
88
margin-top: env(safe-area-inset-top);
99
margin-bottom: env(safe-area-inset-bottom);
1010
margin-left: env(safe-area-inset-left);
1111
margin-right: env(safe-area-inset-right);
1212
}`);
1313

14-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
15-
const SafeAreaProvider = View as any;
16-
1714
render(
1815
<SafeAreaProvider
1916
initialMetrics={{
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { SafeAreaProvider } from "react-native-css/components/react-native-safe-area-context";

0 commit comments

Comments
 (0)