Skip to content

Commit e2419c3

Browse files
committed
chore(lint): default autofocus to false
We use autofocus more often than not. But `noAutofocus` feels odd. This way we need to add two lines to keep the old behavior. Seems like an okay tradeoff for the sake of clarity / simplicity.--signoff
1 parent f623057 commit e2419c3

7 files changed

Lines changed: 25 additions & 23 deletions

File tree

src/components/CollaborativeEditor.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export default defineComponent({
203203
204204
autofocus: {
205205
type: Boolean,
206-
default: true,
206+
default: false,
207207
},
208208
209209
shareToken: {

src/components/PublicFilesEditor.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
<template>
77
<NcModal v-if="active" :name="fileName" @close="close">
88
<EditorReloader
9-
:fileId="fileId"
10-
:relativePath="relativePath"
11-
:active="active"
12-
:shareToken="shareToken"
9+
:fileId
10+
:relativePath
11+
:active
12+
:shareToken
13+
autofocus
1314
:mime="mimeType" />
1415
</NcModal>
1516
</template>

src/components/ViewerComponent.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
:fileId="fileid"
1010
:relativePath="filename"
1111
:active="active || isEmbedded"
12-
:autofocus="autofocus"
13-
:shareToken="shareToken"
12+
:autofocus
13+
:shareToken
1414
:class="{ 'text-editor--embedding': isEmbedded }"
15-
:mime="mime" />
15+
:mime />
1616
<SourceView
1717
v-else
18-
:fileid="fileid"
19-
:filename="filename"
20-
:isEncrypted="isEncrypted"
21-
:mime="mime"
22-
:source="source"
18+
:fileid
19+
:filename
20+
:isEncrypted
21+
:mime
22+
:source
2323
v-bind="$attrs"
2424
@loaded="onLoaded"
2525
@edit="toggleEdit" />

src/createEditor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export async function createCollaborativeEditor(options: CollaborativeEditorOpti
121121
active: true,
122122
fileId: options.fileId,
123123
mime: 'text/markdown',
124-
noAutofocus: options.autofocus === false,
124+
autofocus: options.autofocus ?? true,
125125
readonlyBarComponent: options.readonlyBar?.component,
126126
relativePath: options.filePath,
127127
shareToken: options.shareToken,

src/views/CollaborativeEditorApp.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
:shareToken
1212
mime="text/markdown"
1313
active
14-
:autofocus="!noAutofocus"
14+
:autofocus
1515
onReady="emit('ready')"
1616
@create:content="(c: { markdown: string }) => emit('create:content', c)"
1717
@update:content="(c: { markdown: string }) => emit('update:content', c)">
@@ -30,14 +30,14 @@ import EditorReloader from '../components/EditorReloader.vue'
3030
const {
3131
fileId = undefined,
3232
filePath = undefined,
33-
noAutofocus = false,
33+
autofocus = false,
3434
readonlyBarComponent = undefined,
3535
readonlyBarProps = {},
3636
shareToken = undefined,
3737
} = defineProps<{
3838
fileId?: number
3939
filePath?: string
40-
noAutofocus?: boolean
40+
autofocus?: boolean
4141
readonlyBarComponent?: string
4242
readonlyBarProps?: object
4343
shareToken?: string

src/views/DirectEditing.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
<div id="direct-editor" :class="{ 'icon-loading': saving }">
88
<EditorReloader
99
ref="editor"
10-
:initialSession="initialSession"
11-
:fileId="initial.fileId"
10+
:initialSession
11+
fileId="initial.fileId"
1212
active
13+
autofocus
1314
:mime="initial.mimetype"
1415
isDirectEditing
1516
@ready="loaded">

src/views/RichWorkspace.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
:class="{ focus: focus, dark: darkTheme }">
1111
<RichTextReader
1212
v-if="!loaded || !ready"
13-
:content="content"
13+
:content
1414
class="rich-workspace--preview" />
1515
<EditorReloader
1616
v-if="file"
1717
v-show="ready"
1818
:key="file.path"
1919
:fileId="file.id"
2020
:relativePath="file.path"
21-
:shareToken="shareToken"
21+
:shareToken
2222
:mime="file.mimetype"
23-
:autofocus="autofocus"
24-
:hideMenu="hideMenu"
23+
:autofocus
24+
:hideMenu
2525
active
2626
richWorkspace
2727
@ready="ready = true"

0 commit comments

Comments
 (0)