Skip to content

Commit 4d59e79

Browse files
authored
Move UI changes to main (#6161)
Signed-off-by: Alexander Platov <[email protected]>
1 parent 5d7e109 commit 4d59e79

File tree

17 files changed

+107
-67
lines changed

17 files changed

+107
-67
lines changed

packages/theme/styles/popups.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@
194194
height: max-content;
195195
overflow-x: hidden;
196196
overflow-y: auto;
197-
scrollbar-width: thin;
198197

199198
&::-webkit-scrollbar { width: 0; }
200199
.box {

packages/ui/src/components/Button.svelte

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
export let title: string | undefined = undefined
5858
export let borderStyle: 'solid' | 'dashed' | 'none' = 'solid'
5959
export let id: string | undefined = undefined
60+
export let dataId: string | undefined = undefined
6061
export let input: HTMLButtonElement | undefined = undefined
6162
export let showTooltip: LabelAndProps | undefined = undefined
6263
export let short: boolean = false
@@ -154,6 +155,7 @@
154155
on:mousemove
155156
on:mouseleave
156157
{id}
158+
data-id={dataId}
157159
>
158160
{#if icon && !loading}
159161
<div class="btn-icon pointer-events-none" class:resetIconSize={resetIconSize === 'icon'}>

packages/ui/src/components/NotificationToast.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
$: icon = getIcon()
4444
</script>
4545

46-
<div class="root" in:fade out:fade>
46+
<div class="notifyPopup" in:fade out:fade>
4747
<div class="flex-between">
4848
<div class="flex-row-center">
4949
{#if icon}
@@ -60,7 +60,7 @@
6060
<span class="overflow-label fs-bold text-base caption-color">{title}</span>
6161
</div>
6262
{#if onClose !== undefined}
63-
<Button icon={Close} kind="ghost" size="small" on:click={onClose} />
63+
<Button icon={Close} kind="ghost" size="small" dataId={'btnNotifyClose'} on:click={onClose} />
6464
{/if}
6565
</div>
6666

@@ -76,7 +76,7 @@
7676
</div>
7777

7878
<style lang="scss">
79-
.root {
79+
.notifyPopup {
8080
overflow: hidden;
8181
display: flex;
8282
flex-direction: column;

plugins/activity-resources/src/components/ActivityMessageAction.svelte

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
export let iconProps: any | undefined = undefined
2323
export let size: IconSize = 'small'
2424
export let action: (ev: MouseEvent) => Promise<void> | void = async () => {}
25-
export let opened = false
25+
export let opened: boolean = false
26+
export let dataId: string | undefined = undefined
2627
2728
function onClick (ev: MouseEvent): void {
2829
ev.stopPropagation()
@@ -38,6 +39,7 @@
3839
size="small"
3940
kind="tertiary"
4041
pressed={opened}
41-
on:click={onClick}
42+
{dataId}
4243
tooltip={{ label }}
44+
on:click={onClick}
4345
/>

plugins/activity-resources/src/components/ActivityMessageActions.svelte

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
</script>
8080

8181
{#if message}
82-
<div class="root">
82+
<div class="activityMessage-actionPopup">
8383
{#each inlineActions as inline}
8484
{#if inline.icon}
8585
{#await getResource(inline.action) then action}
@@ -88,6 +88,7 @@
8888
size={inline.actionProps?.size ?? 'small'}
8989
icon={inline.icon}
9090
iconProps={inline.actionProps?.iconProps}
91+
dataId={inline._id}
9192
action={(ev) => action(message, ev, { onOpen, onClose })}
9293
/>
9394
{/await}
@@ -96,18 +97,19 @@
9697

9798
{#if withActionMenu}
9899
<ActivityMessageAction
99-
size="small"
100100
icon={IconMoreV}
101+
label={view.string.MoreActions}
102+
size={'small'}
101103
opened={isActionMenuOpened}
104+
dataId={'btnMoreActions'}
102105
action={showMenu}
103-
label={view.string.MoreActions}
104106
/>
105107
{/if}
106108
</div>
107109
{/if}
108110

109111
<style lang="scss">
110-
.root {
112+
.activityMessage-actionPopup {
111113
display: flex;
112114
align-items: center;
113115
border-radius: 0.375rem;

plugins/task-resources/src/components/state/StatePresenter.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
export let shouldShowAvatar = true
4242
export let inline: boolean = false
4343
export let disabled: boolean = false
44-
export let oneLine: boolean = false
44+
export let oneLine: boolean = true
4545
export let shouldShowName: boolean = true
4646
export let shouldShowTooltip: boolean = false
4747
export let noUnderline: boolean = false
4848
export let accent: boolean = false
49-
export let shrink: number = 0
49+
export let shrink: number = 1
5050
export let space: Ref<Project> | undefined = undefined
5151
export let projectType: Ref<ProjectType> | undefined = $selectedTypeStore
5252
export let taskType: Ref<TaskType> | undefined = undefined

plugins/task-resources/src/components/state/StateRefPresenter.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
export let kind: ButtonKind = 'link'
2828
export let size: ButtonSize = 'medium'
2929
export let shouldShowName: boolean = true
30-
export let shrink: number = 0
30+
export let shrink: number = 1
3131
export let disabled: boolean = false
3232
3333
import { selectedTaskTypeStore, selectedTypeStore } from '../../index'

plugins/templates-resources/src/components/Templates.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162

163163
<div class="hulyComponent-content__container columns">
164164
<div class="hulyComponent-content__column">
165-
<div id="create-template" class="flex-between trans-title m-3">
165+
<div id="create-template" class="flex-between trans-title flex-no-shrink bottom-divider p-3">
166166
<Button
167167
icon={templatesPlugin.icon.Template}
168168
label={templatesPlugin.string.CreateTemplate}
@@ -179,6 +179,7 @@
179179
label={getEmbeddedLabel(space.name)}
180180
actions={async () => await getSpaceActions(space)}
181181
isFold
182+
noDivider
182183
empty={getTemps.length === 0}
183184
>
184185
{#each getTemps as t (t._id)}

plugins/text-editor-resources/src/components/TextActionButton.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
class:selected
6767
use:tooltip={{ label: action.label }}
6868
tabindex="0"
69+
data-id={'btn' + action.label.split(':').pop()}
6970
on:click|preventDefault|stopPropagation={handleClick}
7071
>
7172
<Icon icon={action.icon} {size} />

plugins/time-resources/src/components/DueDateEditor.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
type="type-button"
5656
icon={time.icon.Calendar}
5757
iconSize="small"
58+
id={'dueDateButton'}
5859
title={buttonTitle}
5960
label={buttonLabel}
6061
pressed={opened}

0 commit comments

Comments
 (0)