feat: Seamless Edit (#2701)

* feat: Remove explicit edit

* Restore revision remains disabled for now

* Bump RME, better differentiation of focused state

* fix: Star not visible in edit mode

* remove stray log

* fix: Occassional user context not available in collaborative persistence
This commit is contained in:
Tom Moor
2021-11-08 20:52:17 -08:00
committed by GitHub
parent 37be7f99c4
commit c597f2d9a2
13 changed files with 302 additions and 207 deletions

View File

@@ -88,7 +88,10 @@ class DataLoader extends React.Component<Props> {
}
get isEditing() {
return this.props.match.path === matchDocumentEdit;
return (
this.props.match.path === matchDocumentEdit ||
this.props.auth?.team?.collaborativeEditing
);
}
onSearchLink = async (term: string) => {
@@ -244,7 +247,9 @@ class DataLoader extends React.Component<Props> {
return (
<>
<Loading location={location} />
{this.isEditing && <HideSidebar ui={ui} />}
{this.isEditing && !team?.collaborativeEditing && (
<HideSidebar ui={ui} />
)}
</>
);
}
@@ -261,7 +266,9 @@ class DataLoader extends React.Component<Props> {
return (
<React.Fragment key={key}>
{this.isEditing && <HideSidebar ui={ui} />}
{this.isEditing && !team.collaborativeEditing && (
<HideSidebar ui={ui} />
)}
{this.props.children({
document,
revision,