Merge pull request #1474 from esteemapp/mmore

Fix tag input issues, try post renderer on comments
2025-01-03 19:42:03 +03:00 · 2020-01-10 08:51:41 +02:00 · 2020-01-10 08:51:41 +02:00 · 017ba6bd28
commit 017ba6bd28
parent 240a20ca0d 0b04684199
5 changed files with 198 additions and 54 deletions
--- a/src/components/editorElements/tagInput/view/tagInputStyles.js
+++ b/src/components/editorElements/tagInput/view/tagInputStyles.js
@ -11,4 +11,9 @@ export default EStyleSheet.create({
    borderBottomWidth: 1,
    borderBottomColor: '$primaryLightGray',
  },
+  warning: {
+    color: '$primaryRed',
+    fontSize: 12,
+    fontFamily: '$editorFont',
+  },
 });
--- a/src/components/editorElements/tagInput/view/tagInputView.js
+++ b/src/components/editorElements/tagInput/view/tagInputView.js
@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { View, Alert } from 'react-native';
+import { View, Text } from 'react-native';
 // Constants

 // Components
@ -12,7 +12,6 @@ import globalStyles from '../../../../globalStyles';
 const TagInput = ({
  value,
  onChange,
-  handleIsValid,
  componentID,
  handleTagChanged,
  intl,
@ -20,6 +19,7 @@ const TagInput = ({
  autoFocus,
 }) => {
  const [text, setText] = useState('');
+  const [warning, setWarning] = useState(null);
  const [height, setHeight] = useState(0);

  useEffect(() => {
@ -33,60 +33,56 @@ const TagInput = ({
  // Component Functions
  const _handleOnChange = _text => {
    setText(_text.replace(/,/g, ' ').replace(/#/g, ''));
-  };
-  const _handleOnBlur = () => {
-    if (onChange) {
-      let cats = text.trim().split(' ');
+
+    let cats = _text.split(' ');
    if (handleTagChanged && cats.length > 0) {
      cats.length > 10
-          ? Alert.alert(
-              intl.formatMessage({ id: 'alert.error' }),
-              intl.formatMessage({ id: 'editor.limited_tags' }),
-            )
+        ? (setWarning(intl.formatMessage({ id: 'editor.limited_tags' })), setHeight(60))
        : cats.find(c => c.length > 24)
-          ? Alert.alert(
-              intl.formatMessage({ id: 'alert.error' }),
-              intl.formatMessage({ id: 'editor.limited_length' }),
-            )
+        ? (setWarning(intl.formatMessage({ id: 'editor.limited_length' })), setHeight(60))
        : cats.find(c => c.split('-').length > 2)
-          ? Alert.alert(
-              intl.formatMessage({ id: 'alert.error' }),
-              intl.formatMessage({ id: 'editor.limited_dash' }),
-            )
+        ? (setWarning(intl.formatMessage({ id: 'editor.limited_dash' })), setHeight(60))
        : cats.find(c => c.indexOf(',') >= 0)
-          ? Alert.alert(
-              intl.formatMessage({ id: 'alert.error' }),
-              intl.formatMessage({ id: 'editor.limited_space' }),
-            )
+        ? (setWarning(intl.formatMessage({ id: 'editor.limited_space' })), setHeight(60))
        : cats.find(c => /[A-Z]/.test(c))
-          ? Alert.alert(
-              intl.formatMessage({ id: 'alert.error' }),
-              intl.formatMessage({ id: 'editor.limited_lowercase' }),
-            )
+        ? (setWarning(intl.formatMessage({ id: 'editor.limited_lowercase' })), setHeight(60))
        : cats.find(c => !/^[a-z0-9-#]+$/.test(c))
-          ? Alert.alert(
-              intl.formatMessage({ id: 'alert.error' }),
-              intl.formatMessage({ id: 'editor.limited_characters' }),
-            )
+        ? (setWarning(intl.formatMessage({ id: 'editor.limited_characters' })), setHeight(60))
        : cats.find(c => !/^[a-z-#]/.test(c))
-          ? Alert.alert(
-              intl.formatMessage({ id: 'alert.error' }),
-              intl.formatMessage({ id: 'editor.limited_firstchar' }),
-            )
+        ? (setWarning(intl.formatMessage({ id: 'editor.limited_firstchar' })), setHeight(60))
        : cats.find(c => !/[a-z0-9]$/.test(c))
-          ? Alert.alert(
-              intl.formatMessage({ id: 'alert.error' }),
-              intl.formatMessage({ id: 'editor.limited_lastchar' }),
-            )
-          : null;
+        ? (setWarning(intl.formatMessage({ id: 'editor.limited_lastchar' })), setHeight(60))
+        : setWarning(null);
+
+      handleTagChanged([...cats]);
+    }
+  };
+  const _handleOnBlur = () => {
+    let cats = [];
+    if (onChange) {
+      cats = text.trim().split(' ');
+      if (handleTagChanged && cats.length > 0) {
+        cats.length > 10
+          ? (setWarning(intl.formatMessage({ id: 'editor.limited_tags' })), setHeight(60))
+          : cats.find(c => c.length > 24)
+          ? (setWarning(intl.formatMessage({ id: 'editor.limited_length' })), setHeight(60))
+          : cats.find(c => c.split('-').length > 2)
+          ? (setWarning(intl.formatMessage({ id: 'editor.limited_dash' })), setHeight(60))
+          : cats.find(c => c.indexOf(',') >= 0)
+          ? (setWarning(intl.formatMessage({ id: 'editor.limited_space' })), setHeight(60))
+          : cats.find(c => /[A-Z]/.test(c))
+          ? (setWarning(intl.formatMessage({ id: 'editor.limited_lowercase' })), setHeight(60))
+          : cats.find(c => !/^[a-z0-9-#]+$/.test(c))
+          ? (setWarning(intl.formatMessage({ id: 'editor.limited_characters' })), setHeight(60))
+          : cats.find(c => !/^[a-z-#]/.test(c))
+          ? (setWarning(intl.formatMessage({ id: 'editor.limited_firstchar' })), setHeight(60))
+          : cats.find(c => !/[a-z0-9]$/.test(c))
+          ? (setWarning(intl.formatMessage({ id: 'editor.limited_lastchar' })), setHeight(60))
+          : setWarning(null);
        handleTagChanged([...cats]);
      }
      onChange(text);
    }
-
-    if (handleIsValid) {
-      handleIsValid(componentID, !!(text && text.length));
-    }
  };
  return (
    <View style={[globalStyles.containerHorizontal16, { height: Math.max(35, height) }]}>
@ -108,6 +104,7 @@ const TagInput = ({
        onBlur={() => _handleOnBlur()}
        value={text}
      />
+      {warning && <Text style={styles.warning}>{warning}</Text>}
    </View>
  );
 };
--- a/src/components/postElements/body/view/commentBodyView.js
+++ b/src/components/postElements/body/view/commentBodyView.js
@ -1,13 +1,20 @@
 import React from 'react';
-import { Dimensions, Linking, Alert, TouchableOpacity, Text } from 'react-native';
+import { Dimensions, Linking, Alert, TouchableOpacity, Text, View } from 'react-native';
 import { useIntl } from 'react-intl';
 import HTML from '@esteemapp/react-native-render-html';
 import { getParentsTagsRecursively } from '@esteemapp/react-native-render-html/src/HTMLUtils';
+import AutoHeightWebView from 'react-native-autoheight-webview';
+import EStyleSheet from 'react-native-extended-stylesheet';
+import get from 'lodash/get';
 import { navigate } from '../../../../navigation/service';

 // Constants
 import { default as ROUTES } from '../../../../constants/routeNames';

+import DEFAULT_IMAGE from '../../../../assets/no_image.png';
+import { CommentPlaceHolder } from '../../../basicUIElements';
+import script from './config';
+
 // Styles
 import styles from './postBodyStyles';

@ -19,6 +26,7 @@ const CommentBody = ({
  handleOnUserPress,
  handleOnPostPress,
  created,
+  commentDepth,
 }) => {
  const intl = useIntl();

@ -146,6 +154,22 @@ const CommentBody = ({
          </Text>
        );
      }
+      if (passProps.parentWrapper === 'View') {
+        return (
+          <AutoHeightWebView
+            key={passProps.key}
+            source={{
+              html: passProps.html,
+            }}
+            allowsFullscreenVideo={true}
+            style={{ width: WIDTH - (32 + 29 * 1) }}
+            customScript={script.toString()}
+            startInLoadingState={true}
+            onShouldStartLoadWithRequest={false}
+            scrollEnabled={false}
+          />
+        );
+      }
      return (
        <TouchableOpacity
          key={passProps.key}
@ -163,8 +187,112 @@ const CommentBody = ({

  const _initialDimensions = { width: WIDTH - 50, height: 80 };

+  const customStyle = `
+  * {
+    color: ${EStyleSheet.value('$primaryBlack')};
+    font-family: Roboto, sans-serif;
+    max-width: 100%;
+  }
+  body {
+    color: ${EStyleSheet.value('$primaryBlack')};
+  }
+  a {
+    color: ${EStyleSheet.value('$primaryBlue')};
+    cursor: pointer;
+    text-decoration: underline;
+  }
+  img {
+    align-self: 'center';
+    max-width: 100%;
+  }
+  center {
+    text-align: 'center';
+    align-items: 'center';
+    justify-content: 'center';
+  }
+  th {
+    flex: 1;
+    justify-content: 'center';
+    font-weight: 'bold';
+    color: ${EStyleSheet.value('$primaryBlack')};
+    font-size: 14;
+    padding: 5;
+  }
+  tr {
+    background-color: ${EStyleSheet.value('$darkIconColor')};
+    flex-direction: 'row';
+  }
+  td {
+    border-width: 0.5;
+    border-color: ${EStyleSheet.value('$tableBorderColor')};
+    flex: 1;
+    padding: 10;
+    background-color: ${EStyleSheet.value('$tableTrColor')};
+  }
+  blockquote {
+    border-left-width: 5;
+    border-left-style: solid;
+    border-color: ${EStyleSheet.value('$darkIconColor')};
+    padding-left: 5;
+  }
+  code {
+    background-color: ${EStyleSheet.value('$darkIconColor')};
+    font-family: ${EStyleSheet.value('$editorFont')};
+  }
+  center {
+    text-align: 'center';
+    align-items: 'center';
+    justify-content: 'center';
+  }
+  .markdown-video-link {
+    max-width: 100%;
+    position: relative;
+  }
+  .markdown-video-play {
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    background: url('data:image/png;base64,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') no-repeat center center;
+    z-index: 20;
+    opacity: 0.9;
+    left: 50%;
+    top: 50%;
+    margin-top: -100px;
+    transform: translateX(-50%) translateY(-50%);
+    -webkit-transform: translateX(-50%) translateY(-50%);
+    -moz-transform: translateX(-50%) translateY(-50%);
+  }
+  
+  iframe {
+    width: 100%;
+    height: 240px;
+  }
+  .pull-right {
+    float: right;
+  }
+  .pull-left {
+    float: left;
+  }
+  .pull-left,
+  .pull-right {
+    max-width: calc(50% - 10px);
+    padding-left: 10px;
+    margin-bottom: 10px;
+    box-sizing: border-box;
+  }
+  .phishy {
+    display: inline;
+    color: red;
+  }
+
+  .text-justify {
+    text-align: justify;
+    text-justify: inter-word;
+    letter-spacing: 0px;
+  }
+  `;
  return (
-    <HTML
+    /*<HTML
      html={body}
      onLinkPress={(evt, href, hrefAtr) => _handleOnLinkPress(evt, href, hrefAtr)}
      containerStyle={styles.commentContainer}
@ -179,6 +307,20 @@ const CommentBody = ({
      alterNode={_alterNode}
      alterData={_alterData}
      renderers={_customRenderer}
+    />*/
+    <AutoHeightWebView
+      key={created.toString()}
+      source={{
+        html: body,
+      }}
+      allowsFullscreenVideo={true}
+      style={{ width: WIDTH - (32 + 29 * commentDepth) }}
+      customStyle={customStyle}
+      renderLoading={() => <CommentPlaceHolder />}
+      customScript={script.toString()}
+      startInLoadingState={true}
+      onShouldStartLoadWithRequest={false}
+      scrollEnabled={false}
    />
  );
 };
--- a/src/screens/editor/container/editorContainer.js
+++ b/src/screens/editor/container/editorContainer.js
@ -282,6 +282,10 @@ class EditorContainer extends Component {
              ),
            );

+            this.setState({ isPostSending: false });
+
+            setDraftPost({ title: '', body: '', tags: '' }, currentAccount.name);
+
            navigation.navigate({
              routeName: ROUTES.SCREENS.POST,
              params: {
@ -291,10 +295,6 @@ class EditorContainer extends Component {
              },
              key: permlink,
            });
-
-            this.setState({ isPostSending: false });
-
-            setDraftPost({ title: '', body: '', tags: '' }, currentAccount.name);
          })
          .catch(error => {
            this._handleSubmitFailure(error);
@ -410,12 +410,11 @@ class EditorContainer extends Component {
  _handleSubmitSuccess = () => {
    const { navigation } = this.props;

+    this.stateTimer = setTimeout(() => {
      if (navigation) {
        navigation.goBack();
        navigation.state.params.fetchPost();
      }
-
-    this.stateTimer = setTimeout(() => {
      this.setState({ isPostSending: false });
      clearTimeout(this.stateTimer);
    }, 500);
--- a/src/screens/editor/screen/editorScreen.js
+++ b/src/screens/editor/screen/editorScreen.js
@ -131,8 +131,10 @@ class EditorScreen extends Component {
    } else {
      isFormValid =
        get(fields, 'title', '') &&
+        get(fields, 'title', '').length < 255 &&
        (get(fields, 'body', '') || (bodyText && bodyText > 0)) &&
-        get(fields, 'tags', null);
+        get(fields, 'tags', null) &&
+        get(fields, 'tags', null).length < 10;
    }

    this.setState({ isFormValid });
@ -167,10 +169,9 @@ class EditorScreen extends Component {

  _handleOnTagAdded = async tags => {
    const { fields: _fields } = this.state;
-    const _tags = tags.filter(tag => tag && tag !== ' ');
+    const _tags = tags; //.filter(tag => tag && tag !== ' ');
    const __tags = _tags.map(t => t.toLowerCase());
    const __fields = { ..._fields, tags: [...__tags] };
-
    this.setState({ fields: __fields, isRemoveTag: false }, () => {
      this._handleFormUpdate('tag-area', __fields.tags);
    });