Skip to content

Commit

Permalink
Merge pull request #307 from traPtitech/dependabot/npm_and_yarn/main/…
Browse files Browse the repository at this point in the history
…vue-3.5.6

Bump vue from 3.4.38 to 3.5.6
  • Loading branch information
reiroop authored Sep 21, 2024
2 parents cbc8451 + 910e016 commit 386d6f9
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 212 deletions.
296 changes: 90 additions & 206 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"luxon": "^3.5.0",
"markdown-it": "^14.1.0",
"pinia": "^2.2.2",
"vue": "^3.4.38",
"vue": "^3.5.6",
"vue-router": "^4.4.5",
"vue-toastification": "^2.0.0-rc.5"
},
Expand Down
2 changes: 1 addition & 1 deletion public/mockServiceWorker.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* - Please do NOT serve this file on production.
*/

const PACKAGE_VERSION = '2.4.1'
const PACKAGE_VERSION = '2.4.8'
const INTEGRITY_CHECKSUM = '26357c79639bfa20d64c0efca2a87423'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()
Expand Down
1 change: 1 addition & 0 deletions src/components/groupDetail/GroupBudget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const hasAuthority = canEditGroup(me.value)
<EditButton
v-if="hasAuthority"
class="ml-1"
:is-edit-mode="props.isEditMode"
@click="emit('changeEditMode', 'budget')" />
</div>
<div v-else class="flex items-center">
Expand Down
6 changes: 5 additions & 1 deletion src/components/requestDetail/RequestContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@ const handleUpdateContent = async () => {
@click="toggleEditContent" />
</div>
<div class="flex justify-end">
<SimpleButton v-if="isEditMode" padding="sm" @click="handleUpdateContent">
<SimpleButton
v-if="isEditMode"
font-size="base"
padding="sm"
@click="handleUpdateContent">
完了
</SimpleButton>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/components/requestDetail/RequestTargets.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const handleUpdateTargets = async () => {
<div class="flex items-center gap-2">
<SimpleButton
v-if="isEditMode"
font-size="base"
padding="sm"
@click="handleUpdateTargets">
完了
Expand Down
6 changes: 5 additions & 1 deletion src/components/requestDetail/RequestTitle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ const handleUpdateTitle = async () => {
<div class="flex gap-2">
<h1 v-if="!isEditMode" class="text-2xl">{{ request.title }}</h1>
<InputText v-else v-model="editedTitle" auto-focus class="flex-1" />
<SimpleButton v-if="isEditMode" padding="sm" @click="handleUpdateTitle">
<SimpleButton
v-if="isEditMode"
font-size="base"
padding="sm"
@click="handleUpdateTitle">
完了
</SimpleButton>
<EditButton
Expand Down
4 changes: 2 additions & 2 deletions src/components/shared/InputSelectMultiple.vue
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ const handleKeydown = (e: KeyboardEvent, option: Value) => {
const length =
searchQuery.value !== ''
? searchedOptions.value.length
: props.options?.length ?? 0
: (props.options?.length ?? 0)
focusingListItemIndex.value = (focusingListItemIndex.value + 1) % length
const buttonEl = listItemRefs.value[focusingListItemIndex.value]
.firstChild as HTMLButtonElement
Expand All @@ -202,7 +202,7 @@ const handleKeydown = (e: KeyboardEvent, option: Value) => {
const length =
searchQuery.value !== ''
? searchedOptions.value.length
: props.options?.length ?? 0
: (props.options?.length ?? 0)
focusingListItemIndex.value =
(focusingListItemIndex.value - 1 + length) % length
const buttonEl = listItemRefs.value[focusingListItemIndex.value]
Expand Down

0 comments on commit 386d6f9

Please sign in to comment.