fix: permissions modal width (#1195)

This commit is contained in:
Aman Harwara
2022-07-02 20:20:40 +05:30
committed by GitHub
parent b8e8fb689b
commit dd23135d6d
4 changed files with 39 additions and 47 deletions

View File

@@ -111,7 +111,7 @@ class NoteGroupView extends PureComponent<Props, State> {
{this.viewControllerManager.navigationController.isInFilesView && fileDragNDropContext?.isDraggingFiles && ( {this.viewControllerManager.navigationController.isInFilesView && fileDragNDropContext?.isDraggingFiles && (
<div className="absolute bottom-8 left-1/2 z-dropdown-menu -translate-x-1/2 rounded bg-info px-5 py-3 text-info-contrast shadow-main"> <div className="absolute bottom-8 left-1/2 z-dropdown-menu -translate-x-1/2 rounded bg-info px-5 py-3 text-info-contrast shadow-main">
Drop your files to upload them to Standard Notes Drop your files to upload them
</div> </div>
)} )}

View File

@@ -1,58 +1,54 @@
import { WebApplication } from '@/Application/Application'
import { SNComponent } from '@standardnotes/snjs' import { SNComponent } from '@standardnotes/snjs'
import { Component } from 'react' import { useCallback } from 'react'
import Button from '@/Components/Button/Button' import Button from '@/Components/Button/Button'
import ModalDialog from '../Shared/ModalDialog' import ModalDialog from '../Shared/ModalDialog'
import ModalDialogLabel from '../Shared/ModalDialogLabel' import ModalDialogLabel from '../Shared/ModalDialogLabel'
import ModalDialogDescription from '../Shared/ModalDialogDescription' import ModalDialogDescription from '../Shared/ModalDialogDescription'
import ModalDialogButtons from '../Shared/ModalDialogButtons' import ModalDialogButtons from '../Shared/ModalDialogButtons'
interface Props { type Props = {
application: WebApplication
callback: (approved: boolean) => void callback: (approved: boolean) => void
dismiss: () => void dismiss: () => void
component: SNComponent component: SNComponent
permissionsString: string permissionsString: string
} }
class PermissionsModal extends Component<Props> { const PermissionsModal = ({ callback, component, dismiss, permissionsString }: Props) => {
accept = () => { const accept = useCallback(() => {
this.props.callback(true) callback(true)
this.props.dismiss() dismiss()
} }, [callback, dismiss])
deny = () => { const deny = useCallback(() => {
this.props.callback(false) callback(false)
this.props.dismiss() dismiss()
} }, [callback, dismiss])
override render() { return (
return ( <ModalDialog className="!w-[350px]">
<ModalDialog className="w-[350px]"> <ModalDialogLabel closeDialog={deny}>Activate Component</ModalDialogLabel>
<ModalDialogLabel closeDialog={this.deny}>Activate Component</ModalDialogLabel> <ModalDialogDescription>
<ModalDialogDescription> <div className="text-base">
<div className="text-base"> <strong>{component.displayName}</strong>
<strong>{this.props.component.displayName}</strong> {' would like to interact with your '}
{' would like to interact with your '} {permissionsString}
{this.props.permissionsString} </div>
</div> <div className="sk-panel-row">
<div className="sk-panel-row"> <p className="sk-p">
<p className="sk-p"> Components use an offline messaging system to communicate. Learn more at{' '}
Components use an offline messaging system to communicate. Learn more at{' '} <a href="https://standardnotes.com/permissions" rel="noopener" target="_blank" className="sk-a info">
<a href="https://standardnotes.com/permissions" rel="noopener" target="_blank" className="sk-a info"> https://standardnotes.com/permissions.
https://standardnotes.com/permissions. </a>
</a> </p>
</p> </div>
</div> </ModalDialogDescription>
</ModalDialogDescription> <ModalDialogButtons>
<ModalDialogButtons> <Button primary fullWidth onClick={accept} className="block">
<Button primary fullWidth onClick={this.accept} className="block"> Continue
Continue </Button>
</Button> </ModalDialogButtons>
</ModalDialogButtons> </ModalDialog>
</ModalDialog> )
)
}
} }
export default PermissionsModal export default PermissionsModal

View File

@@ -44,7 +44,6 @@ const PermissionsModalWrapper: FunctionComponent<Props> = ({ application }) => {
return dialog ? ( return dialog ? (
<PermissionsModal <PermissionsModal
application={application}
callback={dialog.callback} callback={dialog.callback}
dismiss={dismissPermissionsDialog} dismiss={dismissPermissionsDialog}
component={dialog.component} component={dialog.component}

View File

@@ -47,15 +47,12 @@ const ConfirmCustomPackage: FunctionComponent<{
return ( return (
<Fragment key={field.value}> <Fragment key={field.value}>
<Subtitle>{field.label}</Subtitle> <Subtitle>{field.label}</Subtitle>
<Text className={'wrap'}>{field.value}</Text> <Text className="wrap mb-2">{field.value}</Text>
<div className="min-h-2" />
</Fragment> </Fragment>
) )
})} })}
<div className="min-h-3" /> <div className="mt-3 flex flex-row">
<div className="flex flex-row">
<Button className="min-w-20" label="Cancel" onClick={() => callback(false)} /> <Button className="min-w-20" label="Cancel" onClick={() => callback(false)} />
<div className="min-w-3" /> <div className="min-w-3" />