@shoutem/ui 4.7.0 → 4.9.1

package/html/elements/Text.js

@@ -1,8 +1,8 @@
 import React from 'react';
+import { Text } from 'react-native';
 import { AllHtmlEntities as Entities } from 'html-entities';
 import _ from 'lodash';
-import { Text } from 'react-native';
-import { ElementPropTypes, combineMappers, mapElementProps } from '../Html';
+import { combineMappers, ElementPropTypes, mapElementProps } from '../Html';
 
 const html = new Entities();
 

package/html/elements/list/Ol.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { View } from '../../../components/View';
-import { ElementPropTypes, combineMappers, mapElementProps } from '../../Html';
+import { combineMappers, ElementPropTypes, mapElementProps } from '../../Html';
 import pickLiChildElements from './helpers/pickLiChildElements';
 import renderItems from './helpers/renderItems';
 

package/html/elements/list/Ul.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { View } from '../../../components/View';
-import { ElementPropTypes, combineMappers, mapElementProps } from '../../Html';
+import { combineMappers, ElementPropTypes, mapElementProps } from '../../Html';
 import pickLiChildElements from './helpers/pickLiChildElements';
 import renderItems from './helpers/renderItems';
 

package/html/elements/list/index.js

@@ -1,7 +1,7 @@
-import Ul from './Ul';
-import Li from './Li';
-import Ol from './Ol';
 import Bullet from './prefix/Bullet';
 import Number from './prefix/Number';
+import Li from './Li';
+import Ol from './Ol';
+import Ul from './Ul';
 
-export { Ul, Ol, Li, Bullet, Number };
+export { Bullet, Li, Number, Ol, Ul };

package/html/index.js

@@ -1,31 +1,31 @@
+import Gallery from './components/Gallery';
+import Image from './components/Image';
+import SimpleHtml from './components/SimpleHtml';
+import A from './elements/A';
+import Block from './elements/Block';
+import Br from './elements/Br';
+import Img from './elements/Img';
+import Inline, { InlineSettings } from './elements/Inline';
+import { Bullet, Li, Number, Ol, Ul } from './elements/list';
+import Text from './elements/Text';
+import Video from './elements/Video';
+import Virtual from './elements/Virtual';
 import {
-  registerElement,
   Display,
+  getElement,
   getElementDisplay,
   getElementProperty,
-  getElement,
+  registerElement,
 } from './services/ElementRegistry';
 import Html, {
+  combineMappers,
   customizeRenderElement,
   ElementPropTypes,
   hasBlockElement,
-  combineMappers,
   mapElementProps,
   renderChildElements,
   renderChildren,
 } from './Html';
-import SimpleHtml from './components/SimpleHtml';
-import Gallery from './components/Gallery';
-import Image from './components/Image';
-import Inline, { InlineSettings } from './elements/Inline';
-import Virtual from './elements/Virtual';
-import Block from './elements/Block';
-import Text from './elements/Text';
-import { Ul, Ol, Li, Bullet, Number } from './elements/list';
-import Img from './elements/Img';
-import A from './elements/A';
-import Br from './elements/Br';
-import Video from './elements/Video';
 
 // Text elements with primary inline display
 Html.registerElement('em', Inline, InlineSettings);
@@ -69,31 +69,31 @@ Html.registerElement('p', Block);
 Html.registerElement('div', Block);
 
 export {
-  Html,
-  customizeRenderElement,
-  ElementPropTypes,
-  hasBlockElement,
+  A,
+  Block,
   combineMappers,
-  mapElementProps,
-  renderChildElements,
-  renderChildren,
+  customizeRenderElement,
   // Element Registry
   Display,
-  registerElement,
+  ElementPropTypes,
+  // Components
+  Gallery,
+  getElement,
   getElementDisplay,
   getElementProperty,
-  getElement,
+  hasBlockElement,
+  Html,
+  Image,
+  Img,
   // Elements
   Inline,
-  Block,
-  Img,
-  A,
-  Ul,
-  Ol,
   Li,
-  Virtual,
-  // Components
-  Gallery,
-  Image,
+  mapElementProps,
+  Ol,
+  registerElement,
+  renderChildElements,
+  renderChildren,
   SimpleHtml,
+  Ul,
+  Virtual,
 };

package/html/services/ElementRegistry.js

@@ -36,7 +36,7 @@ export function getElementDisplay(element) {
     return null;
   }
 
-  const display = elementClass.display;
+  const { display } = elementClass;
   if (!display) {
     // eslint-disable-next-line no-console
     console.warn(

package/html/services/HtmlParser.js

@@ -40,7 +40,8 @@ function stripNewLines(html) {
     .replace(htmlNewLineRegex, match => {
       if (newLineAfterClosingTagRegex.test(match)) {
         return '>';
-      } else if (newLineBeforeOpeningTagRegex.test(match)) {
+      }
+      if (newLineBeforeOpeningTagRegex.test(match)) {
         return '<';
       }
       return ' ';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shoutem/ui",
-  "version": "4.7.0",
+  "version": "4.9.1",
   "description": "Styleable set of components for React Native applications",
   "scripts": {
     "lint": "eslint .",
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@react-native-community/datetimepicker": "3.5.2",
-    "@shoutem/animation": "shoutem/animation#649a9e7",
+    "@shoutem/animation": "~0.15.0",
     "@shoutem/eslint-config-react": "~1.0.6",
-    "@shoutem/theme": "shoutem/theme#ac4754a",
+    "@shoutem/theme": "~0.13.0",
     "auto-bind": "4.0.0",
     "babel-plugin-transform-decorators-legacy": "1.3.5",
     "buffer": "5.6.0",
@@ -47,16 +47,19 @@
     "@babel/core": "7.16.7",
     "@babel/register": "7.9.0",
     "@babel/plugin-proposal-decorators": "7.16.7",
-    "babel-eslint": "9.0.0",
+    "@shoutem/eslint-config-react-native": "~1.0.2",
+    "babel-eslint": "10.1.0",
     "chai": "4.2.0",
     "deep-freeze": "0.0.1",
     "eslint": "6.8.0",
     "eslint-plugin-import": "2.25.4",
-    "eslint-plugin-jsx-a11y": "1.5.5",
+    "eslint-plugin-jsx-a11y": "6.5.1",
     "eslint-plugin-prettier": "3.1.3",
-    "eslint-plugin-react": "5.2.2",
-    "eslint-plugin-react-native": "3.6.0",
-    "metro-react-native-babel-preset": "0.56.4",
+    "eslint-plugin-react": "7.28.0",
+    "eslint-plugin-react-hooks": "4.2.0",
+    "eslint-plugin-react-native": "3.11.0",
+    "eslint-plugin-simple-import-sort": "7.0.0",
+    "metro-react-native-babel-preset": "0.66.2",
     "mocha": "7.1.2",
     "prettier": "1.19.1",
     "react-addons-test-utils": "15.6.2",
@@ -120,11 +123,17 @@
     }
   ],
   "eslintConfig": {
-    "extends": "@shoutem/react",
+    "extends": "@shoutem/react-native",
     "parser": "babel-eslint",
     "parserOptions": {
       "ecmaVersion": 6,
       "sourceType": "module"
     }
+  },
+  "prettier": {
+    "bracketSpacing": true,
+    "jsxBracketSameLine": false,
+    "singleQuote": true,
+    "trailingComma": "all"
   }
 }

package/scripts/add-native-deps.js

@@ -33,7 +33,6 @@ function insertNativeDependencies() {
     console.log(
       `[@shoutem/ui] - error adding dependencies to root package.json\n${e.message}`,
     );
-    return;
   }
 }
 

package/theme.js

@@ -1,17 +1,17 @@
-import { Dimensions, StyleSheet, Platform, StatusBar } from 'react-native';
+import { Dimensions, Platform, StatusBar, StyleSheet } from 'react-native';
 import {
-  INCLUDE,
-  createVariations,
-  createSharedStyle,
-  inverseColorBrightnessForAmount,
   changeColorAlpha,
+  createSharedStyle,
+  createVariations,
   getSizeRelativeToReference,
+  INCLUDE,
+  inverseColorBrightnessForAmount,
 } from '@shoutem/theme';
 import {
-  NAVIGATION_HEADER_HEIGHT,
+  IPHONE_X_HOME_INDICATOR_PADDING,
   IPHONE_X_NOTCH_PADDING,
   IPHONE_XR_NOTCH_PADDING,
-  IPHONE_X_HOME_INDICATOR_PADDING,
+  NAVIGATION_HEADER_HEIGHT,
 } from './const';
 import { Device } from './helpers';