diff --git a/apps/common/mobile/lib/view/collaboration/Comments.jsx b/apps/common/mobile/lib/view/collaboration/Comments.jsx index dd1c5d031..0311bf177 100644 --- a/apps/common/mobile/lib/view/collaboration/Comments.jsx +++ b/apps/common/mobile/lib/view/collaboration/Comments.jsx @@ -703,6 +703,10 @@ const CommentList = inject("storeComments", "storeAppOptions")(observer(({storeC } }; + let arrayComments = [] + comment.comment && comment.comment.replace(/((?:https?:\/\/|ftps?:\/\/|\bwww\.)(?:(?![.,?!;:()]*(?:\s|$))[^\s]){2,})|(\n+|(?:(?!(?:https?:\/\/|ftp:\/\/|\bwww\.)(?:(?![.,?!;:()]*(?:\s|$))[^\s]){2,}).)+)/gim, + (match, link, text) => {console.log(match); arrayComments.push(link ? window.open(link)} href={(link[0]==="w" ? "//" : "") + link} key={arrayComments.length}>{link} + : text)}) return ( @@ -736,7 +740,7 @@ const CommentList = inject("storeComments", "storeAppOptions")(observer(({storeC
{comment.quote &&
{sliceQuote(comment.quote)}
} -
{comment.comment}
+
{arrayComments}
{comment.replies.length > 0 &&
    {comment.replies.map((reply, indexReply) => { diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index 122e3b4f4..7b49b98b0 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -441,6 +441,9 @@ const EditShape = props => { const { t } = useTranslation(); const _t = t('Edit', {returnObjects: true}); const canFill = props.storeFocusObjects.shapeObject.get_ShapeProperties().get_CanFill(); + const storeShapeSettings = props.storeShapeSettings; + const shapeObject = props.storeFocusObjects.shapeObject; + const wrapType = storeShapeSettings.getWrapType(shapeObject); return ( @@ -466,7 +469,7 @@ const EditShape = props => { - @@ -477,7 +480,7 @@ const EditShape = props => { ) }; -const EditShapeContainer = inject("storeFocusObjects")(observer(EditShape)); +const EditShapeContainer = inject("storeFocusObjects","storeShapeSettings")(observer(EditShape)); const PageShapeStyle = inject("storeFocusObjects", "storeShapeSettings")(observer(PageStyle)); const PageShapeStyleNoFill = inject("storeFocusObjects", "storeShapeSettings")(observer(PageStyleNoFill)); const PageShapeCustomFillColor = inject("storeFocusObjects", "storeShapeSettings", "storePalette")(observer(PageCustomFillColor)); diff --git a/apps/documenteditor/mobile/src/view/settings/Settings.jsx b/apps/documenteditor/mobile/src/view/settings/Settings.jsx index 957ac1ea4..4c3227d11 100644 --- a/apps/documenteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Settings.jsx @@ -118,7 +118,7 @@ const SettingsList = inject("storeAppOptions")(observer(props => { {navbar} {!props.inPopover && - + } diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx index 02adafcb8..c81767977 100644 --- a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx @@ -202,9 +202,9 @@ class EditTextController extends Component { let spacing = curSpacing; if (isDecrement) { - spacing = (spacing === null || spacing === undefined) ? 0 : Math.max(-100, --spacing); + spacing = (spacing === null || spacing === undefined || spacing === NaN) ? 0 : Math.max(-100, --spacing); } else { - spacing = (spacing === null || spacing === undefined) ? 0 : Math.min(100, ++spacing); + spacing = (spacing === null || spacing === undefined || spacing === NaN) ? 0 : Math.min(100, ++spacing); } const properties = new Asc.asc_CParagraphProperty(); diff --git a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx index 88b63cf13..7d1b3bcaf 100644 --- a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx +++ b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx @@ -72,6 +72,7 @@ const PageLinkTo = props => { const PageLink = props => { const { t } = useTranslation(); const _t = t('View.Add', {returnObjects: true}); + const regx = /["https://"]/g const [typeLink, setTypeLink] = useState(1); const textType = typeLink === 1 ? _t.textExternalLink : _t.textSlideInThisPresentation; @@ -114,7 +115,13 @@ const PageLink = props => { type="text" placeholder={_t.textLink} value={link} - onChange={(event) => {setLink(event.target.value)}} + onChange={(event) => { + if (link.includes('https://')) { + setDisplay(link) + } + setLink(event.target.value) + setDisplay(event.target.value) + }} /> : { - {!isAndroid &&
    {letterSpacing + ' ' + Common.Utils.Metric.getCurrentMetricName()}
    } + {!isAndroid &&
    {Number(letterSpacing).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName()}
    }
    - {isAndroid && } + {isAndroid && } diff --git a/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx b/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx index 9cf334900..2b2086bc1 100644 --- a/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx @@ -87,7 +87,13 @@ const AddLinkView = props => { type="text" placeholder={_t.textLink} value={link} - onChange={(event) => {setLink(event.target.value)}} + onChange={(event) => { + if (link.includes('https://')) { + setDisplayText(link) + } + setLink(event.target.value) + setDisplayText(event.target.value) + }} className={isIos ? 'list-input-right' : ''} /> }