Skip to content

Bug/staging #1488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ButteryCrumpet merged 2 commits into from
Feb 7, 2022
Merged

Bug/staging #1488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a8ef40
fix faulty propData accurate check
Davy-c Feb 7, 2022
8ad92de
rollback edit title container for list view
Davy-c Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/cloud/components/Views/List/ListDocProperties.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ const ListDocProperties = ({
getInitialPropDataOfPropType(propType)

const isPropDataAccurate =
propData.type === prop.type && propData.subType === prop.subType
propData.type === prop.type &&
(propData.subType || null === prop.subType || null)

return (
<PropPicker
parent={{ type: 'doc', target: doc }}
Expand Down
48 changes: 23 additions & 25 deletions src/cloud/components/Views/List/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import { getDocLinkHref } from '../../Link/DocLink'
import ListViewPropertiesContext from './ListViewPropertiesContext'
import { useListView } from '../../../lib/hooks/views/listView'
import ListDocProperties from './ListDocProperties'
import EditableDocItemContainer from '../EditableDocItemContainer'

type ListViewProps = {
view: SerializedView<ViewListData>
Expand Down Expand Up @@ -230,30 +229,29 @@ const ListView = ({
const { id } = doc
const href = getDocLinkHref(doc, team, 'index')
return (
<EditableDocItemContainer key={id} doc={doc}>
<ListViewItem
id={id}
checked={hasDocInSelection(doc.id)}
onSelect={() => toggleDocInSelection(doc.id)}
showCheckbox={currentUserIsCoreMember}
label={doc.title}
defaultIcon={mdiFileDocumentOutline}
emoji={doc.emoji}
labelHref={href}
labelOnclick={() => push(href)}
onDragStart={(event: any) => saveDocTransferData(event, doc)}
onDragEnd={(event: any) => clearDragTransferData(event)}
onDrop={(event: any) => onDropDoc(event, doc)}
hideOrderingHandle={true}
>
<ListDocProperties
doc={doc}
props={orderedViewProps}
team={team}
currentUserIsCoreMember={currentUserIsCoreMember}
/>
</ListViewItem>
</EditableDocItemContainer>
<ListViewItem
key={id}
id={id}
checked={hasDocInSelection(doc.id)}
onSelect={() => toggleDocInSelection(doc.id)}
showCheckbox={currentUserIsCoreMember}
label={doc.title}
defaultIcon={mdiFileDocumentOutline}
emoji={doc.emoji}
labelHref={href}
labelOnclick={() => push(href)}
onDragStart={(event: any) => saveDocTransferData(event, doc)}
onDragEnd={(event: any) => clearDragTransferData(event)}
onDrop={(event: any) => onDropDoc(event, doc)}
hideOrderingHandle={true}
>
<ListDocProperties
doc={doc}
props={orderedViewProps}
team={team}
currentUserIsCoreMember={currentUserIsCoreMember}
/>
</ListViewItem>
)
})}
{currentWorkspaceId != null && (
Expand Down