Skip to content

Commit 9bf8015

Browse files
authored
Merge pull request #12 from github/combobox
Upgrade combobox-nav to v2 for ARIA 1.2
2 parents 5dc9659 + 89a802e commit 9bf8015

23 files changed

+1302
-1617
lines changed

.eslintrc.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22
"extends": [
33
"plugin:github/browser",
44
"plugin:github/es6",
5-
"plugin:github/flow"
5+
"plugin:github/typescript"
66
],
7+
"globals": {
8+
"TextExpanderElement": "readable"
9+
},
710
"rules": {
811
"no-invalid-this": "off"
912
},
1013
"overrides": [
1114
{
1215
"files": "test/**/*.js",
1316
"rules": {
14-
"flowtype/require-valid-file-annotation": "off",
1517
"github/unescaped-html-literal": "off"
1618
}
1719
},

.flowconfig

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/workflows/nodejs.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,12 @@ jobs:
99

1010
runs-on: ubuntu-latest
1111

12-
strategy:
13-
matrix:
14-
node-version: [8.x, 10.x, 12.x]
15-
1612
steps:
1713
- uses: actions/checkout@v1
18-
- name: Use Node.js ${{ matrix.node-version }}
14+
- name: Use Node.js
1915
uses: actions/setup-node@v1
2016
with:
21-
node-version: ${{ matrix.node-version }}
17+
node-version: '12.x'
2218
- name: npm install, build, and test
2319
run: |
2420
npm install

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,22 @@ $ npm install --save @github/text-expander-element
1010

1111
## Usage
1212

13+
### Script
14+
15+
Import as ES modules:
16+
1317
```js
1418
import '@github/text-expander-element'
1519
```
1620

21+
With a script tag:
22+
23+
```html
24+
<script type="module" src="./node_modules/@github/text-expander-element/dist/bundle.js">
25+
```
26+
27+
### Markup
28+
1729
```html
1830
<text-expander keys=": @ #">
1931
<textarea></textarea>

examples/index.html

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
<head>
44
<meta charset="utf-8">
55
<title>text-expander demo</title>
6+
<style>
7+
[aria-selected="true"] {background: #eee;}
8+
</style>
69
</head>
710
<body>
811
<text-expander keys=":">
9-
<textarea autofocus></textarea>
12+
<textarea autofocus rows="10" cols="40"></textarea>
1013
</text-expander>
1114

1215
<script type="text/javascript">
@@ -15,22 +18,24 @@
1518
const {key, provide} = event.detail
1619
if (key === ':') {
1720
const menu = document.createElement('ul')
18-
const item = document.createElement('li')
19-
item.setAttribute('role', 'option')
20-
item.textContent = '🐈'
21-
menu.append(item)
21+
menu.role = 'listbox'
22+
for (const emoji of ['🐈', '🐕']) {
23+
const item = document.createElement('li')
24+
item.setAttribute('role', 'option')
25+
item.textContent = emoji
26+
item.id = `option-${emoji}`
27+
menu.append(item)
28+
}
2229
provide(Promise.resolve({matched: true, fragment: menu}))
2330
}
2431
})
32+
2533
expander.addEventListener('text-expander-value', function(event) {
2634
const {key, item} = event.detail
27-
if (key === ':') {
28-
event.detail.value = '🐈'
29-
}
35+
if (key === ':') event.detail.value = item.textContent
3036
})
3137
</script>
32-
<script type="text/javascript" src="https://unpkg.com/@github/combobox-nav@latest"></script>
33-
<script type="text/javascript" src="https://unpkg.com/@github/text-expander-element@latest"></script>
34-
<!-- <script src="../dist/index.umd.js"></script> -->
38+
<script type="module" src="https://unpkg.com/@github/text-expander-element@latest/dist/bundle.js"></script>
39+
<!-- <script src="../dist/bundle.js" type="module"></script> -->
3540
</body>
3641
</html>

index.d.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)