Commit e056ff8401226fbfa872e8996202d3a8294e0aa3
fix gatherings (see github.com/mmckegg/mutant/issues/28)
mixmix committed on 8/5/2019, 10:26:38 AMParent: b8e8bccb7f0d43f6b02e0f1a5e8f4a2be24ab15e
Files changed
| app/html/modal.js | changed |
| app/html/modal.mcss | changed |
| package-lock.json | changed |
| package.json | changed |
| app/html/modal.js | |||
|---|---|---|---|
| @@ -3,9 +3,9 @@ | |||
| 3 | 3 … | ||
| 4 | 4 … | exports.gives = nest('app.html.modal') | |
| 5 | 5 … | ||
| 6 | 6 … | exports.create = (api) => { | |
| 7 | - return nest('app.html.modal', (content, { isOpen, onClose, className = '' } = {}) => { | ||
| 7 … | + return nest('app.html.modal', (content, { isOpen, onOpen, onClose, className = '' } = {}) => { | ||
| 8 | 8 … | if (typeof isOpen !== 'function') isOpen = Value(false) | |
| 9 | 9 … | ||
| 10 | 10 … | const openMe = () => { | |
| 11 | 11 … | isOpen.set(true) | |
| @@ -14,9 +14,9 @@ | |||
| 14 | 14 … | isOpen.set(false) | |
| 15 | 15 … | if (typeof onClose === 'function') onClose() | |
| 16 | 16 … | } | |
| 17 | 17 … | ||
| 18 | - const lb = h('Modal -closed', | ||
| 18 … | + const modal = h('Modal -closed', | ||
| 19 | 19 … | { | |
| 20 | 20 … | className, | |
| 21 | 21 … | 'ev-click': closeMe, | |
| 22 | 22 … | 'ev-keydown': ev => { | |
| @@ -32,28 +32,30 @@ | |||
| 32 | 32 … | ) | |
| 33 | 33 … | ||
| 34 | 34 … | isOpen(state => { | |
| 35 | 35 … | if (state === true) { | |
| 36 | - lb.classList.remove('-closed') | ||
| 37 | - lb.classList.add('-open') | ||
| 36 … | + modal.classList.remove('-closed') | ||
| 37 … | + modal.classList.add('-open') | ||
| 38 | 38 … | } else { | |
| 39 | - lb.classList.remove('-open') | ||
| 40 | - lb.classList.add('-closed') | ||
| 39 … | + modal.classList.remove('-open') | ||
| 40 … | + modal.classList.add('-closed') | ||
| 41 | 41 … | return | |
| 42 | 42 … | } | |
| 43 | 43 … | ||
| 44 … | + if (typeof onOpen === 'function') onOpen() | ||
| 44 | 45 … | focus() | |
| 46 … | + | ||
| 45 | 47 … | function focus () { | |
| 46 | - if (!lb.isConnected) setTimeout(focus, 200) | ||
| 48 … | + if (!modal.isConnected) setTimeout(focus, 200) | ||
| 47 | 49 … | else { | |
| 48 | - const target = lb.querySelector('input') || lb.querySelector('textarea') | ||
| 50 … | + const target = modal.querySelector('input') || modal.querySelector('textarea') | ||
| 49 | 51 … | if (target) target.focus() | |
| 50 | 52 … | } | |
| 51 | 53 … | } | |
| 52 | 54 … | }) | |
| 53 | 55 … | ||
| 54 | - lb.open = openMe | ||
| 55 | - lb.close = closeMe | ||
| 56 … | + modal.open = openMe | ||
| 57 … | + modal.close = closeMe | ||
| 56 | 58 … | ||
| 57 | - return lb | ||
| 59 … | + return modal | ||
| 58 | 60 … | }) | |
| 59 | 61 … | } | |
| app/html/modal.mcss | ||
|---|---|---|
| @@ -24,13 +24,15 @@ | ||
| 24 | 24 … | $dontSelect |
| 25 | 25 … | } |
| 26 | 26 … | |
| 27 | 27 … | -open { |
| 28 | - display: grid | |
| 28 … | + /* display: grid */ | |
| 29 … | + visibility: visible | |
| 29 | 30 … | } |
| 30 | 31 … | |
| 31 | 32 … | -closed { |
| 32 | - display: none | |
| 33 … | + /* display: none */ | |
| 34 … | + visibility: hidden | |
| 33 | 35 … | } |
| 34 | 36 … | |
| 35 | 37 … | -dark { |
| 36 | 38 … | div.content { |
| package-lock.json | ||
|---|---|---|
| The diff is too large to show. Use a local git client to view these changes. Old file size: 806011 bytes New file size: 806647 bytes |
| package.json | ||
|---|---|---|
| @@ -65,9 +65,9 @@ | ||
| 65 | 65 … | "libnested": "^1.3.2", |
| 66 | 66 … | "lodash": "^4.17.10", |
| 67 | 67 … | "marama": "^1.2.2", |
| 68 | 68 … | "micro-css": "^2.0.1", |
| 69 | - "mutant": "^3.23.0", | |
| 69 … | + "mutant": "~3.22.1", | |
| 70 | 70 … | "mutant-scroll": "^1.0.2", |
| 71 | 71 … | "noto-color-emoji": "^1.0.0", |
| 72 | 72 … | "open-dyslexic": "^1.0.3", |
| 73 | 73 … | "open-external": "^0.1.1", |
| @@ -77,9 +77,9 @@ | ||
| 77 | 77 … | "patch-settings": "^1.1.2", |
| 78 | 78 … | "patch-suggest": "^3.0.1", |
| 79 | 79 … | "patchbay-book": "^2.0.4", |
| 80 | 80 … | "patchbay-dark-crystal": "^2.0.0", |
| 81 | - "patchbay-gatherings": "^3.2.14", | |
| 81 … | + "patchbay-gatherings": "^3.2.19", | |
| 82 | 82 … | "patchbay-hacky-art": "^1.0.0", |
| 83 | 83 … | "patchbay-poll": "^1.1.4", |
| 84 | 84 … | "patchbay-scry": "^1.5.0", |
| 85 | 85 … | "patchcore": "^2.1.6", |
Built with git-ssb-web