Skip to content

Adjust reference input styles #3816

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
aonnikov merged 4 commits into from
Oct 10, 2023
Merged

Adjust reference input styles #3816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59978aa
adjust reference input styles
annano Oct 9, 2023
daeeb7e
update text editors styles
annano Oct 9, 2023
dc8c5ba
address review comments
annano Oct 10, 2023
ed8581e
fix ui tests
annano Oct 10, 2023
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
295 changes: 117 additions & 178 deletions packages/text-editor/src/components/ReferenceInput.svelte
View file
Open in desktop
Comment thread
lexiv0re marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@
import { getClient } from '@hcengineering/presentation'
import {
AnySvelteComponent,
Button,
ButtonKind,
EmojiPopup,
Icon,
IconEmoji,
Spinner,
handler,
registerFocus,
showPopup,
tooltip,
deviceOptionsStore as deviceInfo,
checkAdaptiveMatching
} from '@hcengineering/ui'
Expand All @@ -40,18 +39,22 @@
import RIMention from './icons/RIMention.svelte'
import Send from './icons/Send.svelte'

const dispatch = createEventDispatcher()
export let content: string = ''
export let showHeader = false
export let showActions = true
export let showSend = true
export let iconSend: Asset | AnySvelteComponent | undefined = undefined
export let labelSend: IntlString | undefined = undefined
export let kindSend: ButtonKind = 'ghost'
export let haveAttachment = false
export let withoutTopBorder = false
export let placeholder: IntlString | undefined = undefined
export let extraActions: RefAction[] | undefined = undefined
export let loading: boolean = false
export let focusable: boolean = false

const client = getClient()
const dispatch = createEventDispatcher()
const buttonSize = 'medium'

let textEditor: TextEditor

Expand Down Expand Up @@ -156,195 +159,131 @@
})
</script>

<div class="ref-container">
<div class="textInput" class:withoutTopBorder>
<div class="inputMsg">
<TextEditor
bind:content
bind:this={textEditor}
on:content={(ev) => {
if (!isEmpty || haveAttachment) {
dispatch('message', ev.detail)
content = ''
textEditor.clear()
}
}}
on:blur={() => {
focused = false
dispatch('blur', focused)
}}
on:focus={() => {
focused = true
updateFocus()
dispatch('focus', focused)
}}
extensions={[
completionPlugin,
EmojiExtension.configure(),
IsEmptyContentExtension.configure({ onChange: (value) => (isEmpty = value) })
]}
on:update
placeholder={placeholder ?? textEditorPlugin.string.EditorPlaceholder}
textFormatCategories={[
TextFormatCategory.TextDecoration,
TextFormatCategory.Link,
TextFormatCategory.List,
TextFormatCategory.Quote,
TextFormatCategory.Code
]}
/>
<div class="ref-container" class:focusable>
{#if showHeader && $$slots.header}
Comment thread
lexiv0re marked this conversation as resolved.
<div class="header">
<slot name="header" />
</div>
{#if showSend}
<button
class="sendButton"
on:click={submit}
use:tooltip={{ label: labelSend ?? textEditorPlugin.string.Send }}
disabled={(isEmpty && !haveAttachment) || loading}
>
<div class="icon">
{#if loading}
<div class="pointer-events-none spinner">
<Spinner size={'medium'} />
</div>
{:else}
<Icon icon={iconSend ?? Send} size={'medium'} />
{/if}
</div>
</button>
{/if}
{/if}
<div class="text-input">
<TextEditor
bind:content
bind:this={textEditor}
on:content={(ev) => {
if (!isEmpty || haveAttachment) {
dispatch('message', ev.detail)
content = ''
textEditor.clear()
}
}}
on:blur={() => {
focused = false
dispatch('blur')
}}
on:focus={() => {
focused = true
updateFocus()
dispatch('focus')
}}
extensions={[
completionPlugin,
EmojiExtension.configure(),
IsEmptyContentExtension.configure({ onChange: (value) => (isEmpty = value) })
]}
on:update
placeholder={placeholder ?? textEditorPlugin.string.EditorPlaceholder}
textFormatCategories={[
TextFormatCategory.TextDecoration,
TextFormatCategory.Link,
TextFormatCategory.List,
TextFormatCategory.Quote,
TextFormatCategory.Code
]}
/>
</div>
<div class="flex-between clear-mins" style:margin={'.75rem .75rem 0'}>
<div class="buttons-group medium-gap">
{#each actions as a}
<!-- svelte-ignore a11y-click-events-have-key-events -->
<div
class="icon-button"
use:tooltip={{ label: a.label }}
on:click={handler(a, (a, evt) => handleAction(a, evt))}
>
<Icon icon={a.icon} size={'medium'} />
{#if showActions || showSend}
<div class="buttons-panel flex-between clear-mins">
{#if showActions}
<div class="buttons-group xsmall-gap">
{#each actions as a}
<Button
icon={a.icon}
iconProps={{ size: buttonSize }}
kind="ghost"
showTooltip={{ label: a.label }}
size={buttonSize}
on:click={handler(a, (a, evt) => handleAction(a, evt))}
/>
{#if a.order % 10 === 1}
<div class="buttons-divider" />
{/if}
{/each}
</div>
{#if a.order % 10 === 1}
<div class="buttons-divider" />
{#if extraActions && extraActions.length > 0}
<div class="buttons-group {shrinkButtons ? 'xsmall-gap' : 'small-gap'}">
{#each extraActions as a}
<Button
disabled={a.disabled}
icon={a.icon}
iconProps={{ size: buttonSize }}
kind="ghost"
showTooltip={{ label: a.label }}
size={buttonSize}
on:click={handler(a, (a, evt) => {
if (!a.disabled) {
handleAction(a, evt)
}
})}
/>
{/each}
</div>
{/if}
{/each}
{/if}

{#if showSend}
<Button
{loading}
disabled={(isEmpty && !haveAttachment) || loading}
icon={iconSend ?? Send}
iconProps={{ size: buttonSize }}
kind={kindSend}
size={buttonSize}
showTooltip={{
label: labelSend ?? textEditorPlugin.string.Send
}}
on:click={submit}
/>
{/if}
</div>
{#if extraActions && extraActions.length > 0}
<div class="buttons-group {shrinkButtons ? 'medium-gap' : 'large-gap'}">
{#each extraActions as a}
<!-- svelte-ignore a11y-click-events-have-key-events -->
<div
class="icon-button"
class:disabled={a.disabled}
use:tooltip={{ label: a.label }}
on:click={handler(a, (a, evt) => {
if (!a.disabled) {
handleAction(a, evt)
}
})}
>
<Icon icon={a.icon} size={'medium'} fill={a.fill} />
</div>
{/each}
</div>
{/if}
</div>
{/if}
</div>

<style lang="scss">
.icon-button {
display: flex;
justify-content: center;
align-items: center;
width: 1.25rem;
height: 1.25rem;
color: var(--theme-darker-color);
cursor: pointer;

&:hover {
color: var(--theme-content-color);
}
&.disabled {
color: var(--theme-trans-color);
&:hover {
color: var(--theme-trans-color);
cursor: not-allowed;
}
}
}
.ref-container {
display: flex;
flex-direction: column;
min-height: 4.5rem;
border: 0.0625rem solid var(--theme-refinput-border);
border-radius: 0.375rem;

.textInput {
display: flex;
justify-content: space-between;
align-items: flex-end;
min-height: 2.75rem;
padding: 0.75rem 1rem;
background-color: var(--theme-refinput-color);
border: 1px solid var(--theme-refinput-border);
border-radius: 0.25rem;

&.withoutTopBorder {
border-top-left-radius: 0;
border-top-right-radius: 0;
}

.inputMsg {
display: flex;
align-self: center;
align-items: center;
width: calc(100% - 1.75rem);
height: 100%;
color: var(--theme-content-color);
background-color: transparent;
border: none;
outline: none;
&.focusable {
&:focus-within {
border-color: var(--primary-edit-border-color);
}
.sendButton {
display: flex;
justify-content: center;
align-items: center;
flex-shrink: 0;
margin-left: 0.5rem;
padding: 0;
width: 1.25rem;
height: 1.25rem;
background-color: transparent;
border: 1px solid transparent;
border-radius: 0.25rem;
outline: none;
cursor: pointer;

.icon {
width: 1.25rem;
height: 1.25rem;
color: var(--theme-content-color);
cursor: pointer;

&:hover {
color: var(--theme-caption-color);
}
}
&:focus {
box-shadow: 0 0 0 2px var(--accented-button-outline);
}
}

& > .icon {
color: var(--theme-caption-color);
}
}
.header {
padding: 0.325rem 0.75rem;
border-bottom: 0.0625rem solid var(--theme-refinput-border);
}

&:disabled {
pointer-events: none;
.text-input {
min-height: 2.75rem;
padding: 0.625rem 0.75rem;
}

.icon {
color: var(--theme-trans-color);
cursor: not-allowed;
}
}
}
}
.buttons-panel {
padding: 0.325rem 0.75rem;
}
</style>
4 changes: 2 additions & 2 deletions packages/text-editor/src/components/StyledTextArea.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { IntlString } from '@hcengineering/platform'
import { IconSize, Label } from '@hcengineering/ui'
import { ButtonSize, Label } from '@hcengineering/ui'
import { createEventDispatcher } from 'svelte'
import textEditorPlugin from '../plugin'
import StyledTextEditor from './StyledTextEditor.svelte'
Expand All @@ -10,7 +10,7 @@
export let placeholder: IntlString = textEditorPlugin.string.EditorPlaceholder

export let showButtons = true
export let buttonSize: IconSize = 'small'
export let buttonSize: ButtonSize = 'small'
export let focus = false
export let kind: 'normal' | 'emphasized' | 'indented' = 'normal'
export let isScrollable: boolean = false
Expand Down
3 changes: 2 additions & 1 deletion packages/text-editor/src/components/StyledTextBox.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import presentation, { MessageViewer } from '@hcengineering/presentation'
import {
ActionIcon,
ButtonSize,
IconCheck,
IconClose,
IconEdit,
Expand Down Expand Up @@ -33,7 +34,7 @@
export let alwaysEdit: boolean = false
export let showButtons: boolean = true
export let hideAttachments: boolean = false
export let buttonSize: IconSize = 'medium'
export let buttonSize: ButtonSize = 'medium'
export let formatButtonSize: IconSize = 'small'
export let hideExtraButtons: boolean = false
export let maxHeight: 'max' | 'card' | 'limited' | string = 'max'
Expand Down
Loading