Skip to content
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

Activity: remove inline from presenters. DoneStatesPopup fix. #3664

Merged
merged 1 commit into from
Sep 6, 2023
Merged

Activity: remove inline from presenters. DoneStatesPopup fix. #3664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions plugins/activity-resources/src/components/TxView.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
{#if value.isObjectAdded}
<ObjectPresenter value={cvalue} inline accent />
{:else}
<svelte:component this={m.presenter} value={cvalue} inline accent />
<svelte:component this={m.presenter} value={cvalue} accent />
{/if}
{/each}
{:else if value.removed.length}
Expand All @@ -256,9 +256,9 @@
<span class="lower"><Label label={m.label} /></span>
{#each value.removed as cvalue}
{#if value.isObjectRemoved}
<ObjectPresenter value={cvalue} inline accent />
<ObjectPresenter value={cvalue} accent />
{:else}
<svelte:component this={m.presenter} value={cvalue} inline accent />
<svelte:component this={m.presenter} value={cvalue} accent />
{/if}
{/each}
{:else if value.set === null || value.set === undefined || value.set === ''}
Expand All @@ -272,9 +272,9 @@
<span class="lower"><Label label={activity.string.To} /></span>
<span class="strong overflow-label">
{#if value.isObjectSet}
<ObjectPresenter value={value.set} inline accent />
<ObjectPresenter value={value.set} accent />
{:else}
<svelte:component this={m.presenter} value={value.set} inline accent />
<svelte:component this={m.presenter} value={value.set} accent />
{/if}
</span>
{:else}
Expand All @@ -300,9 +300,9 @@
{#if !hasMessageType}
<div class="strong overflow-label">
{#if value.isObjectSet}
<ObjectPresenter value={value.set} inline accent />
<ObjectPresenter value={value.set} accent />
{:else}
<svelte:component this={m.presenter} value={value.set} inline accent />
<svelte:component this={m.presenter} value={value.set} accent />
{/if}
</div>
{/if}
Expand All @@ -313,9 +313,9 @@
{#if tx.collectionAttribute !== undefined && (tx.txDocIds?.size ?? 0) > 1}
<TxViewTx {tx} {onCancelEdit} {edit} {viewlet} />
{:else if typeof viewlet.component === 'string'}
<Component is={viewlet.component} {props} on:close={onCancelEdit} inline />
<Component is={viewlet.component} {props} on:close={onCancelEdit} />
{:else}
<svelte:component this={viewlet.component} {...props} on:close={onCancelEdit} inline />
<svelte:component this={viewlet.component} {...props} on:close={onCancelEdit} />
{/if}
{/if}
</div>
Expand Down Expand Up @@ -355,9 +355,9 @@
<div class="activity-content content" class:indent={isAttached} class:contentHidden>
<ShowMore ignore={edit || prevValue !== undefined}>
{#if value.isObjectSet}
<ObjectPresenter value={value.set} inline />
<ObjectPresenter value={value.set} />
{:else if showDiff}
<svelte:component this={model[0].presenter} value={value.set} inline {prevValue} showOnlyDiff />
<svelte:component this={model[0].presenter} value={value.set} {prevValue} showOnlyDiff />
{/if}
</ShowMore>
</div>
Expand Down Expand Up @@ -410,7 +410,7 @@
}
.msgactivity-content__title {
display: inline-flex;
align-items: baseline;
align-items: center;
flex-grow: 1;
min-width: 0;
}
Expand Down
8 changes: 4 additions & 4 deletions plugins/activity-resources/src/components/TxViewTx.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
<IconAdd size={'x-small'} fill={'var(--theme-trans-color)'} />
{/if}
{#if typeof viewlet?.component === 'string'}
<Component is={viewlet?.component} props={getProps(ctx, edit)} disabled inline on:close={onCancelEdit} />
<Component is={viewlet?.component} props={getProps(ctx, edit)} disabled on:close={onCancelEdit} />
{:else}
<svelte:component this={viewlet?.component} {...getProps(ctx, edit)} disabled inline on:close={onCancelEdit} />
<svelte:component this={viewlet?.component} {...getProps(ctx, edit)} disabled on:close={onCancelEdit} />
{/if}
<div class="antiHSpacer" />
{/each}
Expand All @@ -38,9 +38,9 @@
<IconDelete size={'x-small'} fill={'var(--theme-trans-color)'} />
{/if}
{#if typeof viewlet?.component === 'string'}
<Component is={viewlet?.component} props={getProps(ctx, edit)} disabled inline on:close={onCancelEdit} />
<Component is={viewlet?.component} props={getProps(ctx, edit)} disabled on:close={onCancelEdit} />
{:else}
<svelte:component this={viewlet?.component} {...getProps(ctx, edit)} disabled inline on:close={onCancelEdit} />
<svelte:component this={viewlet?.component} {...getProps(ctx, edit)} disabled on:close={onCancelEdit} />
{/if}
<div class="antiHSpacer" />
{/each}
2 changes: 1 addition & 1 deletion plugins/chunter-resources/src/components/activity/TxBacklinkReference.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@

{#if presenter}
<span class="labels-row">
<svelte:component this={presenter.presenter} value={doc} inline disabled />
<svelte:component this={presenter.presenter} value={doc} disabled />
</span>
{/if}
2 changes: 2 additions & 0 deletions plugins/task-resources/src/components/state/DoneStatesPopup.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
</script>

<div class="selectPopup" use:resizeObserver={() => dispatch('changeContent')}>
<div class="menu-space" />
<div class="scroll">
<div class="box">
{#each states as state}
Expand All @@ -80,4 +81,5 @@
</button>
</div>
</div>
<div class="menu-space" />
</div>
2 changes: 1 addition & 1 deletion plugins/tracker-resources/src/components/activity/TxIssueCreated.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
<Label label={isSub ? tracker.string.CreatedSubIssue : tracker.string.CreatedIssue} />
</div>
{#if !isOwnTx}
<IssuePresenter {value} inline />
<IssuePresenter {value} />
{/if}