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

Jump to bottom

💄 feat: MessageInputTextAreaに縦の伸長を追加 #4375

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

💄 feat: MessageInputTextAreaに縦の伸長を追加 #4375

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
3d68b25
💄 feat: MessageInputTextAreaに縦の伸長を追加
reiroop Sep 27, 2024
4339455
💄 feat: MessageEditorでの高さを無制限に
reiroop Sep 27, 2024
56c329b
🎨 chore: cssの記述を簡略化
reiroop Sep 27, 2024
8a9f3be
🐛 fix: type-checkエラーを修正、命名を変更
reiroop Sep 27, 2024
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
1 change: 1 addition & 0 deletions src/components/Main/MainView/MessageElement/MessageEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
:class="$style.inputTextArea"
:is-posting="isPostingAttachment"
simple-padding
disable-height-limit
@add-attachments="onAddAttachments"
@modifier-key-down="onModifierKeyDown"
@modifier-key-up="onModifierKeyUp"
Expand Down
1 change: 1 addition & 0 deletions src/components/Main/MainView/MessageInput/MessageInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
:channel-id="channelId"
:is-posting="isPosting"
:shrink-to-one-line="isMobile && isLeftControlsExpanded"
is-stretchable-on-focus
@focus="onFocus"
@blur="onBlur"
@add-attachments="onAddAttachments"
Expand Down
28 changes: 23 additions & 5 deletions src/components/Main/MainView/MessageInput/MessageInputTextArea.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
rows="1"
:data-simple-padding="simplePadding"
:data-shrink-to-one-line="shrinkToOneLine"
:data-disable-height-limit="disableHeightLimit"
:data-is-stretchable-on-focus="isStretchableOnFocus"
:data-is-mobile="isMobile"
:data-is-firefox="firefoxFlag"
data-testid="message-input-textarea"
Expand Down Expand Up @@ -53,13 +55,17 @@ const props = withDefaults(
isPosting?: boolean
simplePadding?: boolean
shrinkToOneLine?: boolean
disableHeightLimit?: boolean
isStretchableOnFocus?: boolean
}>(),
{
modelValue: '',
channelId: '',
isPosting: false,
simplePadding: false,
shrinkToOneLine: false
shrinkToOneLine: false,
disableHeightLimit: false,
isStretchableOnFocus: false
}
)

Expand Down Expand Up @@ -162,14 +168,26 @@ $vertical-padding: 8px;
padding: $vertical-padding 16px;
// 左から、余白、スタンプパレットボタン、余白、送信ボタン、スクロールバー
padding-right: calc(8px + 24px + 8px + 24px + var(--input-scrollbar-width));
max-height: 160px;
&[data-disable-height-limit='false'] {
&[data-is-mobile='true'] {
max-height: 70px;
}
&[data-is-mobile='false'] {
max-height: 160px;
}
&[data-is-stretchable-on-focus='true']:focus {
max-height: calc(
100% * 2
); // 320px if mobile = false, 140px if mobile = true
}
}
&[data-disable-height-limit='true'] {
max-height: none;
}
&[readonly] {
@include color-ui-secondary-inactive;
cursor: wait;
}
&[data-is-mobile='true'] {
max-height: 70px;
}
&[data-simple-padding='true'] {
padding-right: 16px;
}
Expand Down
Loading