feat: Allow users to override team setting for seamless editing (#5772)
This commit is contained in:
@@ -72,7 +72,7 @@ function DataLoader({ match, children }: Props) {
|
||||
? documents.getSharedTree(document.id)
|
||||
: undefined;
|
||||
const isEditRoute = match.path === matchDocumentEdit;
|
||||
const isEditing = isEditRoute || !!auth.team?.seamlessEditing;
|
||||
const isEditing = isEditRoute || !auth.user?.separateEditMode;
|
||||
const can = usePolicy(document?.id);
|
||||
const location = useLocation<LocationState>();
|
||||
|
||||
|
||||
@@ -391,7 +391,7 @@ class DocumentScene extends React.Component<Props> {
|
||||
render() {
|
||||
const { document, revision, readOnly, abilities, auth, ui, shareId, t } =
|
||||
this.props;
|
||||
const team = auth.team;
|
||||
const { team, user } = auth;
|
||||
const isShare = !!shareId;
|
||||
const embedsDisabled =
|
||||
(team && team.documentEmbeds === false) || document.embedsDisabled;
|
||||
@@ -463,7 +463,7 @@ class DocumentScene extends React.Component<Props> {
|
||||
revision={revision}
|
||||
shareId={shareId}
|
||||
isDraft={document.isDraft}
|
||||
isEditing={!readOnly && !team?.seamlessEditing}
|
||||
isEditing={!readOnly && !!user?.separateEditMode}
|
||||
isSaving={this.isSaving}
|
||||
isPublishing={this.isPublishing}
|
||||
publishingIsDisabled={
|
||||
|
||||
@@ -85,7 +85,7 @@ function DocumentHeader({
|
||||
const { ui, auth } = useStores();
|
||||
const theme = useTheme();
|
||||
const { resolvedTheme } = ui;
|
||||
const { team } = auth;
|
||||
const { team, user } = auth;
|
||||
const isMobile = useMobile();
|
||||
const isRevision = !!revision;
|
||||
|
||||
@@ -224,11 +224,11 @@ function DocumentHeader({
|
||||
<>
|
||||
<ObservingBanner />
|
||||
|
||||
{!isPublishing && isSaving && !team?.seamlessEditing && (
|
||||
{!isPublishing && isSaving && user?.separateEditMode && (
|
||||
<Status>{t("Saving")}…</Status>
|
||||
)}
|
||||
{!isDeleted && !isRevision && <Collaborators document={document} />}
|
||||
{(isEditing || team?.seamlessEditing) && !isTemplate && isNew && (
|
||||
{(isEditing || !user?.separateEditMode) && !isTemplate && isNew && (
|
||||
<Action>
|
||||
<TemplatesMenu
|
||||
document={document}
|
||||
@@ -267,7 +267,7 @@ function DocumentHeader({
|
||||
)}
|
||||
{can.update &&
|
||||
!isEditing &&
|
||||
!team?.seamlessEditing &&
|
||||
user?.separateEditMode &&
|
||||
!isRevision &&
|
||||
editAction}
|
||||
{can.update &&
|
||||
|
||||
Reference in New Issue
Block a user