fix bug 76643

This commit is contained in:
Dmitry-Ilyushechkin
2025-12-10 19:36:38 +03:00
parent e2f06b92c1
commit 206c8504dd
14 changed files with 19 additions and 19 deletions

View File

@ -83,12 +83,12 @@ const CollaborationView = props => {
return (
!Device.phone ?
<Popover id="coauth-popover" className="popover__titled" onPopoverClosed={() => props.closeOptions('coauth')} closeByOutsideClick={false}>
<Popover id="coauth-popover" className="popover__titled" backdrop={false} onPopoverClosed={() => props.closeOptions('coauth')} closeByOutsideClick={true}>
<View style={{height: '430px'}} routes={routes} url={initUrl}>
<CollaborationPage />
</View>
</Popover> :
<Sheet className="coauth__sheet" onSheetClosed={() => props.closeOptions('coauth')}>
<Sheet className="coauth__sheet" backdrop={false} onSheetClosed={() => props.closeOptions('coauth')}>
<View routes={routes} url={initUrl}>
<CollaborationPage />
</View>

View File

@ -1224,7 +1224,7 @@ class MainController extends Component {
inputEl: '#calendar-target-element',
dayNamesShort: [t('Edit.textSu'), t('Edit.textMo'), t('Edit.textTu'), t('Edit.textWe'), t('Edit.textTh'), t('Edit.textFr'), t('Edit.textSa')],
monthNames: [t('Edit.textJanuary'), t('Edit.textFebruary'), t('Edit.textMarch'), t('Edit.textApril'), t('Edit.textMay'), t('Edit.textJune'), t('Edit.textJuly'), t('Edit.textAugust'), t('Edit.textSeptember'), t('Edit.textOctober'), t('Edit.textNovember'), t('Edit.textDecember')],
backdrop: !Device.isPhone,
backdrop: false,
closeByBackdropClick: !Device.isPhone,
value: [val ? new Date(val) : new Date()],
openIn: Device.isPhone ? 'sheet' : 'popover',

View File

@ -134,7 +134,7 @@ class DropdownListView extends Component {
render() {
return (
Device.isPhone ?
<Popup id="dropdown-list-popup" className="dropdown-list-popup" closeByOutsideClick={true} swipeToClose={true} onPopupClosed={() => this.props.closeModal()}>
<Popup id="dropdown-list-popup" className="dropdown-list-popup" backdrop={false} closeByOutsideClick={true} swipeToClose={true} onPopupClosed={() => this.props.closeModal()}>
<PageDropdownList
listItems={this.props.listItems}
onChangeItemList={this.props.onChangeItemList}
@ -147,7 +147,7 @@ class DropdownListView extends Component {
/>
</Popup>
:
<Popover id="dropdown-list-popover" className="popover__titled" closeByOutsideClick={true} onPopoverClosed={() => this.props.closeModal()}>
<Popover id="dropdown-list-popover" className="popover__titled" backdrop={false} closeByOutsideClick={true} onPopoverClosed={() => this.props.closeModal()}>
<PageDropdownList
listItems={this.props.listItems}
onChangeItemList={this.props.onChangeItemList}

View File

@ -76,7 +76,7 @@ const AddView = () => {
return (
!Device.phone ?
<Popover id="add-popover" className="popover__titled" closeByOutsideClick={false} onPopoverClosed={() => mainContext.closeOptions('add')}>
<Popover id="add-popover" className="popover__titled" backdrop={false} closeByOutsideClick={true} onPopoverClosed={() => mainContext.closeOptions('add')}>
<View routes={routes} url='/adding-page/' style={{height: '410px'}}>
<AddingPage />
</View>

View File

@ -253,12 +253,12 @@ const EditView = () => {
return (
!Device.phone ?
<Popover id="edit-popover" className="popover__titled" closeByOutsideClick={false} onPopoverClosed={() => mainContext.closeOptions('edit')}>
<Popover id="edit-popover" className="popover__titled" backdrop={false} closeByOutsideClick={true} onPopoverClosed={() => mainContext.closeOptions('edit')}>
<View style={{ height: '410px' }} routes={routes} url='/editing-page/'>
<EditingPage />
</View>
</Popover> :
<Sheet id="edit-sheet" closeByOutsideClick={false} onSheetClosed={() => mainContext.closeOptions('edit')}>
<Sheet id="edit-sheet" backdrop={false} closeByOutsideClick={false} onSheetClosed={() => mainContext.closeOptions('edit')}>
<View routes={routes} url='/editing-page/'>
<EditingPage />
</View>

View File

@ -107,7 +107,7 @@ const NavigationSheet = inject('storeNavigation')(observer(props => {
}, []);
return (
<Sheet id="view-navigation-sheet" className="navigation-sheet" backdrop={true} closeByBackdropClick={true} onSheetClosed={() => mainContext.closeOptions('navigation')} style={{height: `${stateHeight}`, opacity: `${stateOpacity}`}}>
<Sheet id="view-navigation-sheet" className="navigation-sheet" backdrop={false} closeByBackdropClick={true} onSheetClosed={() => mainContext.closeOptions('navigation')} style={{height: `${stateHeight}`, opacity: `${stateOpacity}`}}>
<div id='swipe-handler' className='swipe-container' onTouchStart={handleTouchStart} onTouchMove={handleTouchMove} onTouchEnd={handleTouchEnd}>
<Icon icon='icon icon-swipe'/>
</div>

View File

@ -119,7 +119,7 @@ const SettingsView = () => {
return (
!Device.phone ?
<Popover id="settings-popover" closeByOutsideClick={false} className="popover__titled" onPopoverClosed={() => mainContext.closeOptions('settings')}>
<Popover id="settings-popover" backdrop={false} closeByOutsideClick={true} className="popover__titled" onPopoverClosed={() => mainContext.closeOptions('settings')}>
<View style={{ height: '410px' }} routes={routes} url='/settings/'>
<SettingsPage />
</View>

View File

@ -80,7 +80,7 @@ const AddView = () => {
return (
!Device.phone ?
<Popover id="add-popover" className="popover__titled" closeByOutsideClick={false} onPopoverClosed={() => mainContext.closeOptions('add')}>
<Popover id="add-popover" className="popover__titled" backdrop={false} closeByOutsideClick={true} onPopoverClosed={() => mainContext.closeOptions('add')}>
<View routes={routes} url='/adding-page/' style={{ height: '410px' }}>
<AddingPage />
</View>

View File

@ -255,12 +255,12 @@ const EditView = () => {
return (
!Device.phone ?
<Popover id="edit-popover" className="popover__titled" closeByOutsideClick={false} onPopoverClosed={() => mainContext.closeOptions('edit')}>
<Popover id="edit-popover" className="popover__titled" backdrop={false} closeByOutsideClick={true} onPopoverClosed={() => mainContext.closeOptions('edit')}>
<View style={{ height: '410px' }} routes={routes} url='/editing-page/'>
<EditingPage />
</View>
</Popover> :
<Sheet id="edit-sheet" onSheetClosed={() => mainContext.closeOptions('edit')}>
<Sheet id="edit-sheet" backdrop={false} onSheetClosed={() => mainContext.closeOptions('edit')}>
<View routes={routes} url='/editing-page/'>
<EditingPage />
</View>

View File

@ -82,7 +82,7 @@ const SettingsView = () => {
return (
!Device.phone ?
<Popover id="settings-popover" closeByOutsideClick={false} className="popover__titled" onPopoverClosed={() => mainContext.closeOptions('settings')}>
<Popover id="settings-popover" backdrop={false} closeByOutsideClick={true} className="popover__titled" onPopoverClosed={() => mainContext.closeOptions('settings')}>
<View style={{ height: '410px' }} routes={routes} url='/settings-page/'>
<SettingsPage />
</View>

View File

@ -190,7 +190,7 @@ const PopoverAllList = (props) => {
};
return (
<Popover id="idx-all-list" className="all-list" onPopoverOpen={onScrollList}>
<Popover id="idx-all-list" backdrop={false} closeByOutsideClick={true} className="all-list" onPopoverOpen={onScrollList}>
<PageAllList sheets={sheets} onTabListClick={onTabListClick}/>
</Popover>
)

View File

@ -88,7 +88,7 @@ const AddView = props => {
return (
!Device.phone ?
<Popover id="add-popover" className="popover__titled" closeByOutsideClick={false} onPopoverClosed={() => mainContext.closeOptions('add')}>
<Popover id="add-popover" className="popover__titled" backdrop={false} closeByOutsideClick={true} onPopoverClosed={() => mainContext.closeOptions('add')}>
<View routes={routes} url='/adding-page/' style={{ height: '410px' }}>
<AddingPage />
</View>

View File

@ -335,12 +335,12 @@ const EditView = () => {
return (
!Device.phone ?
<Popover id="edit-popover" className="popover__titled" closeByOutsideClick={false} onPopoverClosed={() => mainContext.closeOptions('edit')}>
<Popover id="edit-popover" className="popover__titled" backdrop={false} closeByOutsideClick={true} onPopoverClosed={() => mainContext.closeOptions('edit')}>
<View style={{ height: '410px' }} routes={routes} url='/editing-page/'>
<EditingPage />
</View>
</Popover> :
<Sheet id="edit-sheet" onSheetClosed={() => mainContext.closeOptions('edit')}>
<Sheet id="edit-sheet" backdrop={false} onSheetClosed={() => mainContext.closeOptions('edit')}>
<View routes={routes} url='/editing-page/'>
<EditingPage />
</View>

View File

@ -98,7 +98,7 @@ const SettingsView = () => {
return (
!Device.phone ?
<Popover id="settings-popover" closeByOutsideClick={false} className="popover__titled" onPopoverClosed={() => mainContext.closeOptions('settings')}>
<Popover id="settings-popover" backdrop={false} closeByOutsideClick={true} className="popover__titled" onPopoverClosed={() => mainContext.closeOptions('settings')}>
<View routes={routes} url='/settings-page/' style={{ height: '410px' }}>
<SettingsPage />
</View>