Skip to content

Add hook to selection #47

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

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

Add hook to selection #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9a8d79
replace scope with slot-scope
mankowitz Mar 15, 2018
f6c08d2
Merge pull request #1 from mankowitz/mankowitz-patch-1
mankowitz Mar 15, 2018
f2e9503
add processItem hook
mankowitz Mar 15, 2018
4ecbe97
Update AtTextarea.vue
mankowitz Mar 15, 2018
a9a4e40
add :key to template
mankowitz Mar 15, 2018
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
6 changes: 3 additions & 3 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<div id="app">
<at :members="members" name-key="name" v-model="html">
<!-- custom: same as default slot -->
<!-- <template slot="item" scope="s">
<!-- <template slot="item" slot-scope="s">
<span v-text="s.item"></span>
</template> -->

<!-- custom: with avatars -->
<template slot="item" scope="s">
<template slot="item" slot-scope="s">
<img :src="s.item.avatar">
<span v-text="s.item.name"></span>
</template>
Expand All @@ -18,7 +18,7 @@

<at-ta :members="members" name-key="name" v-model="text">
<!-- custom: with avatars -->
<template slot="item" scope="s">
<template slot="item" slot-scope="s">
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed to use slot-scope as a Vue upgrade, 👍
but I've been afraid it would break users that were still using older versions of Vue.

So I'd like to make such changes later in a major bump 😄

<img :src="s.item.avatar">
<span v-text="s.item.name"></span>
</template>
Expand Down
9 changes: 7 additions & 2 deletions src/At.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ export default {
scrollRef: {
type: String,
default: ''
}
},
processItem: {
type: Function,
default: (list, cur, suffix) => {
return itemName(list[cur]) + suffix
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm afriad the itemName here would be "not defined" 😨

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It shouldn’t be undefind. I was able to use it. Maybe add a check first?

Copy link
Owner

@fritx fritx Sep 3, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh my bad

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mankowitz it should be not defined 'cause itemName is defined in methods not in top-level scope.

}
},

data () {
Expand Down Expand Up @@ -352,7 +357,7 @@ export default {
// hack: 连续两次 可以确保click后 focus回来 range真正生效
applyRange(r)
applyRange(r)
const t = itemName(list[cur]) + suffix
const t = processItem(list, cur, suffix)
this.insertText(t, r)
this.handleInput()
}
Expand Down
1 change: 1 addition & 0 deletions src/AtTemplate.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
:class="isCur(index) && 'atwho-cur'"
:ref="isCur(index) && 'cur'"
:data-index="index"
:key="index"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@mouseenter="handleItemHover"
@click="handleItemClick"
>
Expand Down
2 changes: 1 addition & 1 deletion src/AtTextarea.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export default {
const start = index + at.length // 从@后第一位开始
el.selectionStart = start
el.focus() // textarea必须focus回来
const t = itemName(list[cur]) + suffix
const t = processItem(list, cur, suffix)
this.insertText(t, el)
this.handleInput()
}
Expand Down