@evlop/native-components 1.0.167 → 1.0.169

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.
@@ -1,6 +1,6 @@
1
1
  import { Theme } from '@evlop/commons';
2
2
  import React from 'react';
3
- import { Image as RNEImage, ImageProps as RNEImageProps } from 'react-native-elements';
3
+ import { FastImageProps } from 'react-native-fast-image';
4
4
  import { BorderProps, SpaceProps } from 'styled-system';
5
5
  declare const imageSizes: {
6
6
  xxxs: number;
@@ -19,30 +19,21 @@ declare const imageSizes: {
19
19
  fluid: string;
20
20
  };
21
21
  declare type ImageSize = keyof (typeof imageSizes);
22
- declare type NativeImageProps = RNEImageProps & BorderProps<Theme> & SpaceProps<Theme> & {
22
+ declare type StyledImageProps = FastImageProps & BorderProps<Theme> & SpaceProps<Theme> & {
23
23
  width?: ImageSize | number;
24
24
  height?: ImageSize | number;
25
25
  minHeight?: ImageSize | number;
26
26
  minWidth?: ImageSize | number;
27
27
  aspectRatio?: ImageSize | number;
28
28
  };
29
- export declare const BaseImage: React.ForwardRefExoticComponent<Partial<NativeImageProps> & {
29
+ declare type BaseImageProps = Partial<StyledImageProps> & {
30
30
  src?: string;
31
31
  placeholder?: string;
32
- } & React.RefAttributes<RNEImage>>;
33
- export declare const Image: React.ForwardRefExoticComponent<Pick<React.PropsWithChildren<Partial<NativeImageProps> & {
32
+ };
33
+ export declare const BaseImage: React.ForwardRefExoticComponent<Partial<StyledImageProps> & {
34
34
  src?: string;
35
35
  placeholder?: string;
36
- } & React.RefAttributes<RNEImage> & {
37
- model?: string;
38
- dataModel?: string;
39
- configModel?: string;
40
- action?: import("@evlop/commons").Action;
41
- }>, "p" | "source" | "style" | "children" | "id" | "onLayout" | "testID" | "nativeID" | "accessible" | "accessibilityActions" | "accessibilityLabel" | "aria-label" | "accessibilityRole" | "accessibilityState" | "aria-busy" | "aria-checked" | "aria-disabled" | "aria-expanded" | "aria-selected" | "accessibilityHint" | "accessibilityValue" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "onAccessibilityAction" | "importantForAccessibility" | "aria-hidden" | "aria-modal" | "role" | "accessibilityLabelledBy" | "aria-labelledby" | "accessibilityLiveRegion" | "aria-live" | "accessibilityElementsHidden" | "accessibilityViewIsModal" | "onAccessibilityEscape" | "onAccessibilityTap" | "onMagicTap" | "accessibilityIgnoresInvertColors" | "accessibilityLanguage" | "accessibilityShowsLargeContentViewer" | "accessibilityLargeContentTitle" | "border" | "borderX" | "borderY" | "borderWidth" | "borderTopWidth" | "borderBottomWidth" | "borderLeftWidth" | "borderRightWidth" | "borderStyle" | "borderTopStyle" | "borderBottomStyle" | "borderLeftStyle" | "borderRightStyle" | "borderColor" | "borderTopColor" | "borderBottomColor" | "borderLeftColor" | "borderRightColor" | "borderRadius" | "borderTopLeftRadius" | "borderTopRightRadius" | "borderBottomLeftRadius" | "borderBottomRightRadius" | "borderTop" | "borderRight" | "borderBottom" | "borderLeft" | "width" | "height" | "minWidth" | "minHeight" | "m" | "margin" | "mt" | "marginTop" | "mr" | "marginRight" | "mb" | "marginBottom" | "ml" | "marginLeft" | "mx" | "marginX" | "my" | "marginY" | "padding" | "pt" | "paddingTop" | "pr" | "paddingRight" | "pb" | "paddingBottom" | "pl" | "paddingLeft" | "px" | "paddingX" | "py" | "paddingY" | "key" | keyof {
42
- model?: string;
43
- dataModel?: string;
44
- configModel?: string;
45
- action?: import("@evlop/commons").Action;
46
- } | "aspectRatio" | "blurRadius" | "transitionDuration" | "transition" | "onPress" | "onLongPress" | "crossOrigin" | "onLoad" | "onError" | "onLoadStart" | "onProgress" | "placeholder" | "referrerPolicy" | "alt" | "src" | "srcSet" | "Component" | "ImageComponent" | "PlaceholderContent" | "containerStyle" | "placeholderStyle" | "onLoadEnd" | "progressiveRenderingEnabled" | "resizeMode" | "resizeMethod" | "loadingIndicatorSource" | "defaultSource" | "tintColor" | "capInsets" | "onPartialLoad" | "fadeDuration"> & React.RefAttributes<any>>;
36
+ } & React.RefAttributes<any>>;
37
+ export declare const Image: React.ComponentType<BaseImageProps>;
47
38
  export default Image;
48
39
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Image/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAA6B,MAAM,gBAAgB,CAAC;AAElE,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,KAAK,IAAI,QAAQ,EAAE,UAAU,IAAI,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEvF,OAAO,EAAU,WAAW,EAA8B,UAAU,EAAU,MAAM,eAAe,CAAC;AAEpG,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;CAef,CAAC;AAEF,aAAK,SAAS,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;AAE3C,aAAK,gBAAgB,GAAG,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG;IAC/E,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC3B,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC/B,QAAQ,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC9B,WAAW,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CAClC,CAAA;AA4CD,eAAO,MAAM,SAAS;UADoC,MAAM;kBAAgB,MAAM;kCAuBrF,CAAC;AAQF,eAAO,MAAM,KAAK;UA/BwC,MAAM;kBAAgB,MAAM;;;;;;;;;;;6hBAoFzE,CAAC;AAEd,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Image/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAA6B,MAAM,gBAAgB,CAAC;AAElE,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,OAAkB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEpE,OAAO,EAAU,WAAW,EAA8B,UAAU,EAAU,MAAM,eAAe,CAAC;AAEpG,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;CAef,CAAC;AAEF,aAAK,SAAS,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;AAE3C,aAAK,gBAAgB,GAAG,cAAc,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG;IAChF,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC3B,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC/B,QAAQ,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC9B,WAAW,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CAClC,CAAA;AA2CD,aAAK,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AACxF,eAAO,MAAM,SAAS;UADoC,MAAM;kBAAgB,MAAM;6BAsBrF,CAAC;AAQF,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,cAAc,CAqDzC,CAAC;AAEd,eAAe,KAAK,CAAC"}
@@ -42,7 +42,7 @@ const commons_1 = require("@evlop/commons");
42
42
  const lodash_1 = require("lodash");
43
43
  const react_1 = __importStar(require("react"));
44
44
  const react_native_1 = require("react-native");
45
- const react_native_elements_1 = require("react-native-elements");
45
+ const react_native_fast_image_1 = __importDefault(require("react-native-fast-image"));
46
46
  const native_1 = __importDefault(require("styled-components/native"));
47
47
  const styled_system_1 = require("styled-system");
48
48
  const imageSizes = {
@@ -92,7 +92,7 @@ const imageSize = (0, styled_system_1.system)({
92
92
  scale: 'imageSizes',
93
93
  },
94
94
  });
95
- const NativeImage = (0, native_1.default)(react_native_elements_1.Image)({ minHeight: 15, minWidth: 15, width: '100%', aspectRatio: "1" }, styled_system_1.layout, styled_system_1.border, styled_system_1.space, imageSize);
95
+ const StyledImage = (0, native_1.default)(react_native_fast_image_1.default)({ minHeight: 15, minWidth: 15, width: '100%', aspectRatio: "1" }, styled_system_1.layout, styled_system_1.border, styled_system_1.space, imageSize);
96
96
  exports.BaseImage = (0, react_1.forwardRef)((_a, ref) => {
97
97
  var { src, placeholder, source } = _a, props = __rest(_a, ["src", "placeholder", "source"]);
98
98
  const template = (0, commons_1.useTemplate)();
@@ -102,7 +102,9 @@ exports.BaseImage = (0, react_1.forwardRef)((_a, ref) => {
102
102
  return { uri: imageUri };
103
103
  return source;
104
104
  }, [imageUri, source]);
105
- return (react_1.default.createElement(NativeImage, Object.assign({ ref: ref, resizeMode: "contain", placeholderStyle: styles.placeholder, source: imageSource }, props)));
105
+ return (react_1.default.createElement(StyledImage, Object.assign({ ref: ref, resizeMode: "contain",
106
+ // placeholderStyle={styles.placeholder}
107
+ source: imageSource }, props)));
106
108
  });
107
109
  const styles = react_native_1.StyleSheet.create({
108
110
  placeholder: {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Image/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Image/index.tsx"],"names":[],"mappings":"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"}
@@ -4,5 +4,8 @@ export declare const RenderPage: ({ id }: {
4
4
  id: any;
5
5
  }) => JSX.Element;
6
6
  export declare const getPageComponentById: ((pageId: any) => (props: any) => JSX.Element) & import("lodash").MemoizedFunction;
7
+ export declare const getScreenOptionsForPage: ((page: any, pageTypes: any[]) => {
8
+ title: any;
9
+ }) & import("lodash").MemoizedFunction;
7
10
  export default RenderPage;
8
11
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/RenderPage/index.tsx"],"names":[],"mappings":";;AAaA,eAAO,MAAM,UAAU;;iBAwGtB,CAAC;AAEF,eAAO,MAAM,oBAAoB,4BAA6B,GAAG,qDAA2C,CAAC;AAE7G,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/RenderPage/index.tsx"],"names":[],"mappings":";;AAaA,eAAO,MAAM,UAAU;;iBAsFtB,CAAC;AAEF,eAAO,MAAM,oBAAoB,4BAA6B,GAAG,qDAA2C,CAAC;AAE7G,eAAO,MAAM,uBAAuB,UAAkB,GAAG,aAAa,GAAG,EAAE;;sCAqBxD,CAAC;AAEpB,eAAe,UAAU,CAAC"}
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.getPageComponentById = exports.RenderPage = void 0;
29
+ exports.getScreenOptionsForPage = exports.getPageComponentById = exports.RenderPage = void 0;
30
30
  const commons_1 = require("@evlop/commons");
31
31
  const native_1 = require("@react-navigation/native");
32
32
  const lodash_1 = require("lodash");
@@ -57,23 +57,10 @@ const RenderPage = ({ id }) => {
57
57
  }, [pageTypes, page.routeName]);
58
58
  // set navigation options from page, page type components and params
59
59
  (0, react_1.useLayoutEffect)(() => {
60
- const navigationOptions = {};
61
- for (const pageTypeComponent of pageTypeComponents) {
62
- const pageTypeNavigationOptions = pageTypeComponent.screenOptions;
63
- if (pageTypeNavigationOptions) {
64
- Object.assign(navigationOptions, pageTypeNavigationOptions);
65
- }
66
- }
67
- if (page === null || page === void 0 ? void 0 : page.screenOptions) {
68
- Object.assign(navigationOptions, page.screenOptions);
69
- }
70
60
  if (params === null || params === void 0 ? void 0 : params.screenOptions) {
71
- Object.assign(navigationOptions, params.screenOptions);
61
+ navigation.setOptions(params.screenOptions);
72
62
  }
73
- if (Object.keys(navigationOptions).length === 0)
74
- return;
75
- navigation.setOptions(navigationOptions);
76
- }, [page === null || page === void 0 ? void 0 : page.screenOptions, params === null || params === void 0 ? void 0 : params.screenOptions, pageTypeComponents]);
63
+ }, [params === null || params === void 0 ? void 0 : params.screenOptions]);
77
64
  const { layout, dataSources, drawer } = page || {};
78
65
  let pageContent = (0, react_1.useMemo)(() => (react_1.default.createElement(react_1.default.Fragment, null,
79
66
  react_1.default.createElement(RenderPageHeader_1.default, { key: "page-header", page: page }),
@@ -101,5 +88,21 @@ const RenderPage = ({ id }) => {
101
88
  };
102
89
  exports.RenderPage = RenderPage;
103
90
  exports.getPageComponentById = (0, lodash_1.memoize)(pageId => (props) => react_1.default.createElement(exports.RenderPage, Object.assign({}, props, { id: pageId })));
91
+ exports.getScreenOptionsForPage = (0, lodash_1.memoize)((page, pageTypes) => {
92
+ const pageTypeComponents = pageTypes === null || pageTypes === void 0 ? void 0 : pageTypes.filter((p) => p instanceof Function && p.routeName === page.routeName);
93
+ const navigationOptions = {
94
+ title: page.title || page.name,
95
+ };
96
+ for (const pageTypeComponent of pageTypeComponents) {
97
+ const pageTypeNavigationOptions = pageTypeComponent.screenOptions;
98
+ if (pageTypeNavigationOptions) {
99
+ Object.assign(navigationOptions, pageTypeNavigationOptions);
100
+ }
101
+ }
102
+ if (page === null || page === void 0 ? void 0 : page.screenOptions) {
103
+ Object.assign(navigationOptions, page.screenOptions);
104
+ }
105
+ return navigationOptions;
106
+ }, page => page.id);
104
107
  exports.default = exports.RenderPage;
105
108
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/RenderPage/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/RenderPage/index.tsx"],"names":[],"mappings":"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"}
@@ -1,12 +1,11 @@
1
1
  import { ComponentWithSettings, Theme } from '@evlop/commons';
2
2
  import React from 'react';
3
3
  import { TextProps as RNTextProps } from 'react-native';
4
- import { BorderProps, LayoutProps, BackgroundProps, ColorProps, TypographyProps, SpaceProps } from 'styled-system';
4
+ import { BackgroundProps, BorderProps, ColorProps, LayoutProps, SpaceProps, TypographyProps } from 'styled-system';
5
5
  declare type NativeTextProps = RNTextProps & BorderProps<Theme> & LayoutProps<Theme> & BackgroundProps<Theme> & ColorProps<Theme> & TypographyProps<Theme> & SpaceProps<Theme> & {
6
6
  fontScale?: number;
7
7
  };
8
8
  declare type BaseTextProps = NativeTextProps & {
9
- isEditing?: boolean;
10
9
  content?: string;
11
10
  };
12
11
  export declare const BaseText: React.ComponentType<BaseTextProps>;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Text/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,KAAK,EAGN,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,EAAkB,SAAS,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AAExE,OAAO,EAAgE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,eAAe,EAAE,UAAU,EAAG,MAAM,eAAe,CAAC;AAGlL,aAAK,eAAe,GAAG,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAyB9L,aAAK,aAAa,GAAG,eAAe,GAAG;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAE/E,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,aAAa,CAUvD,CAAC;AAEF,eAAO,MAAM,IAAI,EAAE,qBAAqB,CAAC,aAAa,CAgC1C,CAAC;AAEb,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Text/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EAErB,KAAK,EAEN,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAkB,SAAS,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AAExE,OAAO,EAAc,eAAe,EAAU,WAAW,EAAS,UAAU,EAAU,WAAW,EAAS,UAAU,EAAsB,eAAe,EAAE,MAAM,eAAe,CAAC;AAEjL,aAAK,eAAe,GAAG,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAyB9L,aAAK,aAAa,GAAG,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAM3D,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,aAAa,CAcvD,CAAC;AAEF,eAAO,MAAM,IAAI,EAAE,qBAAqB,CAAC,aAAa,CAgC1C,CAAC;AAEb,eAAe,IAAI,CAAC"}
@@ -1,27 +1,4 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  var __rest = (this && this.__rest) || function (s, e) {
26
3
  var t = {};
27
4
  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -39,12 +16,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
39
16
  Object.defineProperty(exports, "__esModule", { value: true });
40
17
  exports.Text = exports.BaseText = void 0;
41
18
  const commons_1 = require("@evlop/commons");
42
- const react_1 = __importStar(require("react"));
19
+ const lodash_1 = require("lodash");
20
+ const react_1 = __importDefault(require("react"));
43
21
  const react_native_1 = require("react-native");
44
22
  const native_1 = __importDefault(require("styled-components/native"));
45
23
  const styled_system_1 = require("styled-system");
46
- const lodash_1 = require("lodash");
47
- const NativeText = (0, native_1.default)(react_native_1.Text)((0, styled_system_1.system)({
24
+ const StyledText = (0, native_1.default)(react_native_1.Text)((0, styled_system_1.system)({
48
25
  fontSize: {
49
26
  property: 'lineHeight',
50
27
  scale: 'lineHeights',
@@ -53,11 +30,16 @@ const NativeText = (0, native_1.default)(react_native_1.Text)((0, styled_system_
53
30
  }), styled_system_1.border, styled_system_1.layout, styled_system_1.background, styled_system_1.color, styled_system_1.typography, styled_system_1.space, ({ fontSize, fontScale = 1, theme: { fontSize: baseFontSize }, }) => !fontSize && ({
54
31
  fontSize: fontScale * baseFontSize,
55
32
  }));
33
+ const handlebarTemplateRegex = /{{[^{}]+}}/;
34
+ const testHandlebarTemplate = (0, lodash_1.memoize)((content) => typeof content === 'string' && handlebarTemplateRegex.test(content));
56
35
  const BaseText = (_a) => {
57
- var { isEditing, children, color = 'gray-900', fontWeight = 'Regular', content = children } = _a, props = __rest(_a, ["isEditing", "children", "color", "fontWeight", "content"]);
58
- let template = (0, commons_1.useTemplate)();
59
- let displayValue = (0, react_1.useMemo)(() => template(content), [template, content]);
60
- return (react_1.default.createElement(NativeText, Object.assign({}, props, { color: color, fontWeight: fontWeight }), displayValue));
36
+ var { children, color = 'gray-900', fontWeight = 'Regular', content = children } = _a, props = __rest(_a, ["children", "color", "fontWeight", "content"]);
37
+ const isTemplate = testHandlebarTemplate(content);
38
+ let displayValue = content;
39
+ if (isTemplate) {
40
+ displayValue = react_1.default.createElement(commons_1.RenderTemplate, { template: content });
41
+ }
42
+ return (react_1.default.createElement(StyledText, Object.assign({}, props, { color: color, fontWeight: fontWeight }), displayValue));
61
43
  };
62
44
  exports.BaseText = BaseText;
63
45
  exports.Text = (0, commons_1.withSettings)({
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Text/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Text/index.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@evlop/native-components",
3
- "version": "1.0.167",
3
+ "version": "1.0.169",
4
4
  "description": "",
5
5
  "main": "dist/main.js",
6
6
  "scripts": {
@@ -22,6 +22,7 @@
22
22
  "react": "^16.12.0",
23
23
  "react-native": "^0.76.1",
24
24
  "react-native-elements": "^3.1.0",
25
+ "react-native-fast-image": "^8.6.3",
25
26
  "react-native-safe-area-context": "^4.3.1",
26
27
  "react-native-tab-view": "^4.1.0",
27
28
  "react-native-vector-icons": "^10.0.3",
@@ -30,7 +31,7 @@
30
31
  "styled-system": "^5.1.5"
31
32
  },
32
33
  "devDependencies": {
33
- "@evlop/commons": "^1.0.310",
34
+ "@evlop/commons": "^1.0.314",
34
35
  "@types/lodash": "^4.14.178",
35
36
  "@types/react-native": "^0.73.0",
36
37
  "@types/react-redux": "^7.1.34",
@@ -44,6 +45,7 @@
44
45
  "react": "^16.12.0",
45
46
  "react-native": "^0.76.1",
46
47
  "react-native-elements": "^3.1.0",
48
+ "react-native-fast-image": "^8.6.3",
47
49
  "react-native-safe-area-context": "^4.3.1",
48
50
  "react-native-tab-view": "^4.1.0",
49
51
  "react-native-vector-icons": "^10.0.3",