Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #988 from ONLYOFFICE/feature/fix-bug-reactjs

Browse source 
Feature/fix bug reactjs
This commit is contained in:
maxkadushkin 2021-07-16 12:41:35 +03:00 committed by GitHub
parent cc2b2916ae 2dce8b8db3
commit 98875a124b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/documenteditor/mobile/src/view/add/AddLink.jsx
View file

@ -13,6 +13,8 @@ const PageLink = props => {
const [stateLink, setLink] = useState(''); const [stateLink, setLink] = useState('');
const [stateDisplay, setDisplay] = useState(display); const [stateDisplay, setDisplay] = useState(display);
const [stateTip, setTip] = useState(''); const [stateTip, setTip] = useState('');
const [stateAutoUpdate, setAutoUpdate] = useState(true);
return ( return (
<Page> <Page>
{!props.noNavbar && <Navbar title={_t.textAddLink} backLink={_t.textBack}></Navbar>} {!props.noNavbar && <Navbar title={_t.textAddLink} backLink={_t.textBack}></Navbar>}
@ -22,14 +24,16 @@ const PageLink = props => {
type="text" type="text"
placeholder={_t.textLink} placeholder={_t.textLink}
value={stateLink} value={stateLink}
onChange={(event) => {setLink(event.target.value)}} onChange={(event) => {setLink(event.target.value);
if(stateAutoUpdate) setDisplay(event.target.value); }}
></ListInput> ></ListInput>
<ListInput <ListInput
label={_t.textDisplay} label={_t.textDisplay}
type="text" type="text"
placeholder={_t.textDisplay} placeholder={_t.textDisplay}
value={stateDisplay} value={stateDisplay}
onChange={(event) => {setDisplay(event.target.value)}} onChange={(event) => {setDisplay(event.target.value);
setAutoUpdate(event.target.value == ''); }}
></ListInput> ></ListInput>
<ListInput <ListInput
label={_t.textScreenTip} label={_t.textScreenTip}

3
apps/presentationeditor/mobile/src/controller/Toolbar.jsx
View file

@ -131,7 +131,6 @@ const ToolbarController = inject('storeAppOptions', 'users')(observer(props => {
} }
} }
const [disabledAdd, setDisabledAdd] = useState(false);
const [disabledEdit, setDisabledEdit] = useState(false); const [disabledEdit, setDisabledEdit] = useState(false);
const onApiFocusObject = (objects) => { const onApiFocusObject = (objects) => {
if (isDisconnected) return; if (isDisconnected) return;
@ -153,7 +152,6 @@ const ToolbarController = inject('storeAppOptions', 'users')(observer(props => {
} }
}); });
setDisabledAdd(slide_deleted);
setDisabledEdit(slide_deleted || (objectLocked || no_object) && slide_lock); setDisabledEdit(slide_deleted || (objectLocked || no_object) && slide_lock);
} }
}; };
@ -194,7 +192,6 @@ const ToolbarController = inject('storeAppOptions', 'users')(observer(props => {
isCanRedo={isCanRedo} isCanRedo={isCanRedo}
onUndo={onUndo} onUndo={onUndo}
onRedo={onRedo} onRedo={onRedo}
disabledAdd={disabledAdd}
disabledEdit={disabledEdit} disabledEdit={disabledEdit}
disabledPreview={disabledPreview} disabledPreview={disabledPreview}
disabledControls={disabledControls} disabledControls={disabledControls}

4
apps/presentationeditor/mobile/src/view/Toolbar.jsx
View file

@ -29,8 +29,8 @@ const ToolbarView = props => {
<Link className={props.disabledControls ? 'disabled' : ''} icon='icon-edit' href={false} onClick={props.onEditDocument}></Link> <Link className={props.disabledControls ? 'disabled' : ''} icon='icon-edit' href={false} onClick={props.onEditDocument}></Link>
} }
{props.isEdit && EditorUIController.getToolbarOptions && EditorUIController.getToolbarOptions({ {props.isEdit && EditorUIController.getToolbarOptions && EditorUIController.getToolbarOptions({
disabledAdd: props.disabledAdd || props.disabledControls || isDisconnected, disabledEdit: props.disabledEdit || props.disabledControls || isDisconnected || props.disabledPreview,
disabledEdit: props.disabledEdit || props.disabledControls || isDisconnected, disabledAdd: props.disabledControls || isDisconnected,
onEditClick: () => props.openOptions('edit'), onEditClick: () => props.openOptions('edit'),
onAddClick: () => props.openOptions('add') onAddClick: () => props.openOptions('add')
})} })}

8
apps/presentationeditor/mobile/src/view/add/AddLink.jsx
View file

@ -99,7 +99,7 @@ const PageLink = props => {
const display = props.getTextDisplay(); const display = props.getTextDisplay();
const displayDisabled = display !== false && display === null; const displayDisabled = display !== false && display === null;
const [stateDisplay, setDisplay] = useState(display !== false ? ((display !== null) ? display : _t.textDefault) : ""); const [stateDisplay, setDisplay] = useState(display !== false ? ((display !== null) ? display : _t.textDefault) : "");
const [stateAutoUpdate, setAutoUpdate] = useState(true);
const [screenTip, setScreenTip] = useState(''); const [screenTip, setScreenTip] = useState('');
return ( return (
@ -116,7 +116,8 @@ const PageLink = props => {
placeholder={_t.textLink} placeholder={_t.textLink}
value={link} value={link}
onChange={(event) => { onChange={(event) => {
setLink(event.target.value) setLink(event.target.value);
if(stateAutoUpdate) setDisplay(event.target.value);
}} }}
/> : /> :
<ListItem link={'/add-link-to/'} title={_t.textLinkTo} after={displayTo} routeProps={{ <ListItem link={'/add-link-to/'} title={_t.textLinkTo} after={displayTo} routeProps={{
@ -129,7 +130,8 @@ const PageLink = props => {
placeholder={_t.textDisplay} placeholder={_t.textDisplay}
value={stateDisplay} value={stateDisplay}
disabled={displayDisabled} disabled={displayDisabled}
onChange={(event) => {setDisplay(event.target.value)}} onChange={(event) => {setDisplay(event.target.value);
setAutoUpdate(event.target.value == ''); }}
/> />
<ListInput label={_t.textScreenTip} <ListInput label={_t.textScreenTip}
type="text" type="text"

8
apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx
View file

@ -62,7 +62,7 @@ const AddLinkView = props => {
const displayDisabled = displayText === 'locked'; const displayDisabled = displayText === 'locked';
displayText = displayDisabled ? _t.textSelectedRange : displayText; displayText = displayDisabled ? _t.textSelectedRange : displayText;
const [stateDisplayText, setDisplayText] = useState(displayText); const [stateDisplayText, setDisplayText] = useState(displayText);
const [stateAutoUpdate, setAutoUpdate] = useState(true);
const [screenTip, setScreenTip] = useState(''); const [screenTip, setScreenTip] = useState('');
const activeSheet = props.activeSheet; const activeSheet = props.activeSheet;
@ -88,7 +88,8 @@ const AddLinkView = props => {
placeholder={_t.textLink} placeholder={_t.textLink}
value={link} value={link}
onChange={(event) => { onChange={(event) => {
setLink(event.target.value) setLink(event.target.value);
if(stateAutoUpdate) setDisplayText(event.target.value);
}} }}
className={isIos ? 'list-input-right' : ''} className={isIos ? 'list-input-right' : ''}
/> />
@ -114,7 +115,8 @@ const AddLinkView = props => {
placeholder={_t.textDisplay} placeholder={_t.textDisplay}
value={stateDisplayText} value={stateDisplayText}
disabled={displayDisabled} disabled={displayDisabled}
onChange={(event) => {setDisplayText(event.target.value)}} onChange={(event) => {setDisplayText(event.target.value);
setAutoUpdate(event.target.value == ''); }}
className={isIos ? 'list-input-right' : ''} className={isIos ? 'list-input-right' : ''}
/> />
<ListInput label={_t.textScreenTip} <ListInput label={_t.textScreenTip}