-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #175 from zallo-labs/Z-187-policy-settings
Z 187 policy settings
- Loading branch information
Showing
213 changed files
with
2,787 additions
and
2,477 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,28 @@ | ||
module.exports = { | ||
root: true, | ||
parser: '@typescript-eslint/parser', | ||
parserOptions: { | ||
ecmaFeatures: { | ||
jsx: true, | ||
}, | ||
ecmaVersion: '2021', | ||
sourceType: 'module', | ||
}, | ||
extends: [ | ||
'eslint:recommended', | ||
'plugin:@typescript-eslint/recommended', | ||
'plugin:react/recommended', | ||
'neverthrow', | ||
], | ||
plugins: ['@typescript-eslint', 'react-hooks'], | ||
env: { | ||
es2021: true, | ||
browser: true, | ||
node: true, | ||
mocha: true, | ||
}, | ||
parser: '@typescript-eslint/parser', | ||
// parserOptions: { | ||
// ecmaVersion: '2021', | ||
// sourceType: 'module', | ||
// }, | ||
extends: [ | ||
'eslint:recommended', | ||
'plugin:eslint-comments/recommended', | ||
'plugin:@typescript-eslint/recommended', | ||
// 'plugin:neverthrow/recommended', // https://github.com/mdbetancourt/eslint-plugin-neverthrow/issues/14 | ||
'prettier' /* last */, | ||
], | ||
plugins: ['@typescript-eslint', 'neverthrow'], | ||
rules: { | ||
'@typescript-eslint/no-var-requires': 'off', | ||
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }], | ||
'@typescript-eslint/no-non-null-assertion': 'off', | ||
'@typescript-eslint/no-empty-interface': 'off', | ||
'react-hooks/rules-of-hooks': 'error', | ||
'react-hooks/exhaustive-deps': [ | ||
'warn', | ||
{ additionalHooks: '(useRecoilCallback|useRecoilTransaction_UNSTABLE)' }, | ||
], | ||
'neverthrow/must-use-result': 'error', | ||
}, | ||
ignorePatterns: ['**/node_modules', '**/dist', '**/*generated*'], | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+16.7 KB
.yarn/cache/@humanwhocodes-config-array-npm-0.11.13-12314014f2-f8ea57b0d7.zip
Binary file not shown.
Binary file added
BIN
+14 KB
.yarn/cache/@humanwhocodes-object-schema-npm-2.0.1-c23364bbfc-24929487b1.zip
Binary file not shown.
Binary file removed
BIN
-14.7 KB
.yarn/cache/@jridgewell-sourcemap-codec-npm-1.4.15-a055fb62cf-b881c7e503.zip
Binary file not shown.
Binary file not shown.
Binary file removed
BIN
-2.84 KB
.yarn/cache/@types-react-addons-shallow-compare-npm-0.14.22-ba2a67823c-5e24d24622.zip
Binary file not shown.
Binary file removed
BIN
-91.8 KB
.yarn/cache/@types-react-native-npm-0.69.3-faed45f73d-7d5aa4b303.zip
Binary file not shown.
Binary file removed
BIN
-7.22 KB
.yarn/cache/@types-react-native-snap-carousel-npm-3.8.5-cd83d36c47-8f51243601.zip
Binary file not shown.
Binary file added
BIN
+738 KB
.yarn/cache/@typescript-eslint-eslint-plugin-npm-6.10.0-b0bb2180c8-eaf1f66ae1.zip
Binary file not shown.
Binary file renamed
BIN
+10.1 KB
...arser-npm-6.4.0-bf5dbcdb6b-36c8dbeacf.zip → ...rser-npm-6.10.0-d659957dae-c4b140932d.zip
Binary file not shown.
Binary file added
BIN
+327 KB
.yarn/cache/@typescript-eslint-scope-manager-npm-6.10.0-a8ebca443c-c9b9483082.zip
Binary file not shown.
Binary file removed
BIN
-327 KB
.yarn/cache/@typescript-eslint-scope-manager-npm-6.4.0-5d171185da-19406eac3a.zip
Binary file not shown.
Binary file added
BIN
+47.9 KB
.yarn/cache/@typescript-eslint-type-utils-npm-6.10.0-bf443bce30-cfe9520cf0.zip
Binary file not shown.
Binary file removed
BIN
-42.8 KB
.yarn/cache/@typescript-eslint-types-npm-5.62.0-5c2e0aab15-48c8711738.zip
Binary file not shown.
Binary file added
BIN
+30.2 KB
.yarn/cache/@typescript-eslint-types-npm-6.10.0-ad3bff287b-e63a9e05eb.zip
Binary file not shown.
Binary file removed
BIN
-29.7 KB
.yarn/cache/@typescript-eslint-types-npm-6.4.0-911eef0008-85b293ad15.zip
Binary file not shown.
Binary file removed
BIN
-180 KB
.yarn/cache/@typescript-eslint-typescript-estree-npm-5.62.0-5d1ea132a9-3624520abb.zip
Binary file not shown.
Binary file added
BIN
+169 KB
.yarn/cache/@typescript-eslint-typescript-estree-npm-6.10.0-7880dab921-15bd8d9239.zip
Binary file not shown.
Binary file removed
BIN
-200 KB
.yarn/cache/@typescript-eslint-typescript-estree-npm-6.4.0-5419cb7b42-a8db389655.zip
Binary file not shown.
Binary file added
BIN
+101 KB
.yarn/cache/@typescript-eslint-utils-npm-6.10.0-38043b4e14-b6bd4d6862.zip
Binary file not shown.
Binary file removed
BIN
-11 KB
.yarn/cache/@typescript-eslint-visitor-keys-npm-5.62.0-da1af55f83-976b05d103.zip
Binary file not shown.
Binary file renamed
BIN
+11.2 KB
...-keys-npm-6.4.0-adb9d991f5-42eb614b9c.zip → ...keys-npm-6.10.0-6783c90d56-9640bfae41.zip
Binary file not shown.
Binary file added
BIN
+13.9 KB
.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed
BIN
-6.95 KB
.yarn/cache/eslint-config-standard-with-typescript-npm-39.0.0-ba75c1892c-a5d76edd09.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+19.1 KB
.yarn/cache/eslint-plugin-eslint-comments-npm-3.2.0-b1dc85dfb2-c9fe273dd5.zip
Binary file not shown.
Binary file removed
BIN
-40.9 KB
.yarn/cache/eslint-plugin-formatjs-npm-4.10.5-cb94b47eb9-ecba262dfb.zip
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+1.67 KB
.yarn/cache/eslint-plugin-react-native-globals-npm-0.1.2-1a654c3f21-ab91e8ecbb.zip
Binary file not shown.
Binary file added
BIN
+18.1 KB
.yarn/cache/eslint-plugin-react-native-npm-4.1.0-6e3a231226-b6acc5aa91.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed
BIN
-6.36 KB
.yarn/cache/react-addons-shallow-compare-npm-15.6.2-e462ec4a85-cfe94358c6.zip
Binary file not shown.
Binary file renamed
BIN
+1.48 MB
...aper-npm-5.10.6-1ac084d510-6793a0ad54.zip → ...aper-npm-5.11.1-686e668968-26331e8d54.zip
Binary file not shown.
Binary file not shown.
Binary file removed
BIN
-164 KB
.yarn/cache/react-native-snap-carousel-npm-4.0.0-beta.6-7e0afd1910-32ab752009.zip
Binary file not shown.
Binary file added
BIN
+107 KB
.yarn/cache/react-native-unistyles-npm-1.1.1-c1107bca72-06450b901d.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
53 changes: 53 additions & 0 deletions
53
.yarn/patches/react-native-paper-npm-5.11.1-686e668968.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
diff --git a/lib/module/components/Typography/Text.js b/lib/module/components/Typography/Text.js | ||
index 0f74223bec974f8460cd69740a8f9b89142b9201..2549639deab9e799fae1667c6a48dff484059858 100644 | ||
--- a/lib/module/components/Typography/Text.js | ||
+++ b/lib/module/components/Typography/Text.js | ||
@@ -1,6 +1,8 @@ | ||
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } | ||
import * as React from 'react'; | ||
import { I18nManager, StyleSheet, Text as NativeText } from 'react-native'; | ||
+import AnimatedText from './AnimatedText'; | ||
+import StyledText from './v2/StyledText'; | ||
import { useInternalTheme } from '../../core/theming'; | ||
import { forwardRef } from '../../utils/forwardRef'; | ||
// @component-group Typography | ||
@@ -61,7 +63,10 @@ const Text = (_ref, ref) => { | ||
if (theme.isV3 && variant) { | ||
let font = theme.fonts[variant]; | ||
let textStyle = [font, style]; | ||
- if (rest.children && typeof rest.children === 'object' && 'props' in rest.children) { | ||
+ if (React.isValidElement(rest.children) && | ||
+ (rest.children.type === Component || | ||
+ rest.children.type === AnimatedText || | ||
+ rest.children.type === StyledText)) { | ||
const { | ||
props | ||
} = rest.children; | ||
diff --git a/src/components/Typography/Text.tsx b/src/components/Typography/Text.tsx | ||
index 0492751d8e6199dc75f493c036dc51fe2f679bab..78d2949a4301d844fc538795e5071d46883ca4d0 100644 | ||
--- a/src/components/Typography/Text.tsx | ||
+++ b/src/components/Typography/Text.tsx | ||
@@ -7,7 +7,9 @@ import { | ||
TextStyle, | ||
} from 'react-native'; | ||
|
||
+import AnimatedText from './AnimatedText'; | ||
import type { VariantProp } from './types'; | ||
+import StyledText from './v2/StyledText'; | ||
import { useInternalTheme } from '../../core/theming'; | ||
import type { ThemeProp } from '../../types'; | ||
import { forwardRef } from '../../utils/forwardRef'; | ||
@@ -96,9 +98,10 @@ const Text = ( | ||
let textStyle = [font, style]; | ||
|
||
if ( | ||
- rest.children && | ||
- typeof rest.children === 'object' && | ||
- 'props' in rest.children | ||
+ React.isValidElement(rest.children) && | ||
+ (rest.children.type === Component || | ||
+ rest.children.type === AnimatedText || | ||
+ rest.children.type === StyledText) | ||
) { | ||
const { props } = rest.children; | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.