From 1bcc1dfc829bb4616bd90d8e5f2944f463e70503 Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Sat, 3 Dec 2022 01:10:53 +0700 Subject: [PATCH] Allow attachments customizations. (#2414) Signed-off-by: Andrey Sobolev --- .../src/components/CollaboratorEditor.svelte | 7 +- .../src/components/AddAttachment.svelte | 8 ++- .../src/components/Attachments.svelte | 45 +++++++++--- plugins/attachment-resources/src/utils.ts | 10 ++- .../src/components/ClassAttributeBar.svelte | 71 ++++++++++--------- .../src/components/Table.svelte | 7 +- 6 files changed, 96 insertions(+), 52 deletions(-) diff --git a/packages/text-editor/src/components/CollaboratorEditor.svelte b/packages/text-editor/src/components/CollaboratorEditor.svelte index 201efd4e44..c38994a805 100644 --- a/packages/text-editor/src/components/CollaboratorEditor.svelte +++ b/packages/text-editor/src/components/CollaboratorEditor.svelte @@ -79,6 +79,8 @@ export let field: string | undefined = undefined + export let autoOverflow = false + const ydoc = (getContext(CollaborationIds.Doc) as Y.Doc | undefined) ?? new Y.Doc() const contextProvider = getContext(CollaborationIds.Provider) as WebsocketProvider | undefined const wsProvider = @@ -464,7 +466,7 @@ let showDiff = true -
+
{#if isFormatting && !readonly}
@@ -709,4 +711,7 @@ span.deletion { text-decoration: line-through; } + .autoOverflow { + overflow: auto; + } diff --git a/plugins/attachment-resources/src/components/AddAttachment.svelte b/plugins/attachment-resources/src/components/AddAttachment.svelte index b37c593e47..3a3a756f50 100644 --- a/plugins/attachment-resources/src/components/AddAttachment.svelte +++ b/plugins/attachment-resources/src/components/AddAttachment.svelte @@ -13,11 +13,13 @@ // limitations under the License. --> -
{ - collapsed = !collapsed - }} -> -
- - -
- - - +{#if showHeader} +
{ + collapsed = !collapsed + }} + > +
+ + +
+ + + +
+
+
+
-
-
-
+{/if} {#if keys.length}
p.key)} {readonly} {draft} on:update /> diff --git a/plugins/view-resources/src/components/Table.svelte b/plugins/view-resources/src/components/Table.svelte index f2dc3f7ad7..dcd2a8213a 100644 --- a/plugins/view-resources/src/components/Table.svelte +++ b/plugins/view-resources/src/components/Table.svelte @@ -44,6 +44,7 @@ export let baseMenuClass: Ref> | undefined = undefined export let config: (BuildModelKey | string)[] export let tableId: string | undefined = undefined + export let readonly = false // If defined, will show a number of dummy items before real data will appear. export let loadingProps: LoadingProps | undefined = undefined @@ -243,7 +244,11 @@ on:mouseover={() => onRow(object)} on:focus={() => {}} bind:this={refs[row]} - on:contextmenu|preventDefault={(ev) => showMenu(ev, object, row)} + on:contextmenu|preventDefault={(ev) => { + if (!readonly) { + showMenu(ev, object, row) + } + }} > {#each model as attribute, cell} {#if !cell}