This commit is contained in:
Keith Cirkel 2020-02-24 15:36:17 +00:00
Родитель 9d19ccd480
Коммит 08c65de090
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: E0736F11348DDD3A
14 изменённых файлов: 158 добавлений и 57 удалений

Просмотреть файл

@ -6,20 +6,25 @@ import {getMethods} from './getmethods'
* Bind `[data-action]` elements from the DOM to their actions.
*/
export function bindEvents(classObject: any) {
const methods = getMethods(classObject.prototype)
const name = dasherize(classObject.name)
wrap(classObject.prototype, 'connectedCallback', function (this: HTMLElement) {
const selectors = methods.map(method => `[data-action*=":${name}#${method}"]`).join(',')
for(const el of this.querySelectorAll(selectors)) {
for(const el of this.querySelectorAll(`[data-action*=":${this.tagName.toLowerCase()}#"]`)) {
// Ignore nested elements
if (el.closest(this.tagName) !== this) continue
// Match the pattern of `eventName:constructor#method`.
for(const binding of (el.getAttribute('data-action')||'').split(' ')) {
const [rest, method] = binding.split('#')
const [eventName, handler] = rest.split(':')
if (handler === name) {
if (handler !== this.tagName.toLowerCase()) continue
// Check the `method` is present on the prototype
const methodDescriptor = Object.getOwnPropertyDescriptor(classObject.prototype, method)
if (methodDescriptor && typeof methodDescriptor.value == 'function') {
el.addEventListener(eventName, (event: Event) => {
if (event.target === el) (this as any)[method](event)
})
}
}
}
})

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -5,7 +5,7 @@ import {dasherize} from './dasherize'
* `data-target` element of the same name.
*/
const createSelector = (receiver: Element, key: string) => `[data-target~="${dasherize(receiver.constructor.name) + "." + key}"]`
const createSelector = (receiver: Element, key: string) => `[data-target*="${receiver.tagName.toLowerCase()}.${key}"]`
export function target(proto: object, key: string) {
Object.defineProperty(
@ -14,7 +14,7 @@ export function target(proto: object, key: string) {
{
configurable: true,
get: function() {
return this.querySelector(createSelector(this, key))
return this.querySelectorAll(createSelector(this, key)).find((el: Element) => el.closest(this.tagName) === this)
},
}
);
@ -27,7 +27,7 @@ export function targets(proto: object, key: string) {
{
configurable: true,
get: function() {
return this.querySelectorAll(createSelector(this, key))
return this.querySelectorAll(createSelector(this, key)).filter((el: Element) => el.closest(this.tagName) === this)
},
}
);

Просмотреть файл

Просмотреть файл

@ -1,23 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
</head>
<body>
<hello-controller>
<input data-target="hello-controller.nameTarget" type="text" data-action="click:hello-controller#greet"/>
<ajax-form>
<button data-action="click:hello-controller#greet">
Greet
</button>
<span data-target="hello-controller.outputTarget"> </span>
</ajax-form>
</hello-controller>
<script src="dist/index.js"></script>
</body>
</html>

8
package-lock.json сгенерированный
Просмотреть файл

@ -1,5 +1,5 @@
{
"name": "vanilla-ts",
"name": "@catalyst/root",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
@ -73,12 +73,6 @@
"acorn": "^7.1.0"
}
},
"systemjs": {
"version": "6.2.2",
"resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.2.2.tgz",
"integrity": "sha512-w/E0mvyvz+kEpMkHqFAcFaxclCgAuu+iLbAE1F/S8E4Lv4Pk/KpamcusDnHLIpwKwa518sVBPu95z7VMbN264Q==",
"dev": true
},
"tslib": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",

Просмотреть файл

@ -1,19 +1,30 @@
{
"name": "vanilla-ts",
"version": "1.0.0",
"description": "JavaScript and TypeScript example starter project",
"scripts": {
"build": "rollup -c rollup.config.ts"
},
"dependencies": {},
"private": true,
"keywords": [
"typescript",
"javascript"
],
"homepage": "https://github.com/keithamus/catalyst#readme",
"bugs": {
"url": "https://github.com/keithamus/catalyst/issues"
},
"repository": {
"type": "git",
"url": "git+https://github.com/keithamus/catalyst.git"
},
"license": "MIT",
"author": "Keith Cirkel (https://keithcirkel.co.uk/)",
"contributors": [
"Kristján Oddsson <koddsson@gmail.com>"
],
"workspaces": [
"core/",
"decorators/",
"site/"
],
"devDependencies": {
"@rollup/plugin-typescript": "^3.0.0",
"rollup": "^1.31.0",
"systemjs": "^6.2.2",
"tslib": "^1.10.0",
"typescript": "^3.7.5"
}

101
site/index.html Normal file
Просмотреть файл

@ -0,0 +1,101 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="primer.css">
</head>
<body class="mb-6">
<header class="position-sticky top-0 d-flex"
style="z-index: 1; height: 125px; background-image: linear-gradient(to top, transparent, white 50%)">
<div class="flex-1 ml-3">
<h1 class="m-0 mt-2">Catalyst</h1>
</div>
<nav class="f3">
<ul class="d-flex list-style-none mr-6">
<li class="m-3">
<a href="/">
Home
</a>
</li>
<li class="m-3">
<a href="/handbook">
Guide
</a>
</li>
<li class="m-3">
<a href="/reference">
Reference
</a>
</li>
<li class="m-3">
<a href="https://github.com/github/catalyst">
Source Code
</a>
</li>
</ul>
</nav>
</header>
<section class="d-flex flex-justify-center container-xl clearfix">
<div class="mt-6">
<h1 class="h000-mktg mt-6 mr-6" style="max-width: 500px">Write YavaScript<br class="hide-sm"> Like a Boss</h1>
<ul class="d-flex list-style-none mt-4">
<li class="mt-3">
<a href="/handbook" class="f3 btn btn-large btn-outline bg-blue text-white" style="height: 56px; line-height: 1.2;">
Read the Guide
</a>
</li>
<li class="ml-4 mt-3">
<a href="/reference" class="f3 btn btn-large btn-outline" style="height: 56px; line-height: 1.2;">
<svg width="24" height="24" class="octicon octicon-book mr-1" viewBox="0 0 16 16" version="1.1"><path fill-rule="evenodd" d="M3 5h4v1H3V5zm0 3h4V7H3v1zm0 2h4V9H3v1zm11-5h-4v1h4V5zm0 2h-4v1h4V7zm0 2h-4v1h4V9zm2-6v9c0 .55-.45 1-1 1H9.5l-1 1-1-1H2c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h5.5l1 1 1-1H15c.55 0 1 .45 1 1zm-8 .5L7.5 3H2v9h6V3.5zm7-.5H9.5l-.5.5V12h6V3z"></path></svg>
Reference
</a>
</li>
</ul>
</div>
<svg width="500px" class="hide-md hide-sm" xmlns="http://www.w3.org/2000/svg" width="888" height="475.27072" viewBox="0 0 888 475.27072"><title>true_love</title><rect x="402.54442" y="219.17275" width="2.57298" height="13.89411" transform="translate(-11.71503 -369.44906) rotate(26.64397)" fill="#fff"/><path d="M426.98456,248.842a66.00006,66.00006,0,0,0-93.33814,0l-.01788.01788a65.982,65.982,0,0,0-93.30231,93.30237l-.01788.01788,93.33807,93.33807,93.33814-93.33807A66,66,0,0,0,426.98456,248.842Z" transform="translate(-156 -212.36464)" fill="#ff6584"/><path d="M709.42956,621.81706h-489.679a9.98831,9.98831,0,0,1-1.82989-.145l231.59565-401.157a16.2157,16.2157,0,0,1,28.22705,0L633.17308,489.72253l7.44637,12.8816Z" transform="translate(-156 -212.36464)" fill="#6c63ff"/><polygon points="553.43 409.452 386.241 409.452 468.314 290.239 474.22 281.652 477.173 277.358 484.619 290.239 553.43 409.452" opacity="0.2"/><path d="M982.07935,621.36464H558.54722l82.07223-119.21293,5.9062-8.58777L753.47313,338.20663c7.01145-10.182,23.87881-10.81607,32.12223-1.92044a19.328,19.328,0,0,1,1.54006,1.92044Z" transform="translate(-156 -212.36464)" fill="#3f3d56"/><rect y="407.93322" width="888" height="2.24072" fill="#3f3d56"/><ellipse cx="570.05705" cy="586.26729" rx="32.34192" ry="10.15313" transform="translate(-329.28848 33.15083) rotate(-21.1763)" fill="#2f2e41"/><circle cx="349.2698" cy="382.74826" r="64.68385" fill="#2f2e41"/><rect x="319.79361" y="433.51279" width="19.65079" height="35.20766" fill="#2f2e41"/><rect x="359.09519" y="433.51279" width="19.65079" height="35.20766" fill="#2f2e41"/><ellipse cx="336.16927" cy="469.12985" rx="16.37566" ry="6.14087" fill="#2f2e41"/><ellipse cx="375.47085" cy="468.31107" rx="16.37566" ry="6.14087" fill="#2f2e41"/><circle cx="350.90736" cy="366.3726" r="22.10714" fill="#fff"/><circle cx="350.90736" cy="366.3726" r="7.36905" fill="#3f3d56"/><path d="M442.52428,534.95878c-5.22292-23.39065,11.47266-47.02591,37.29064-52.79083s50.9816,8.52354,56.20452,31.91418-11.88759,32.01752-37.70556,37.78245S447.74721,558.34942,442.52428,534.95878Z" transform="translate(-156 -212.36464)" fill="#e6e6e6"/><ellipse cx="440.41422" cy="603.0993" rx="32.34192" ry="10.15313" transform="translate(-453.46127 275.69894) rotate(-45)" fill="#2f2e41"/><path d="M473.49729,618.44821c0,6.33082,16.30083,18.832,34.38888,18.832s35.04764-17.82327,35.04764-24.15409-16.95958,1.22817-35.04764,1.22817S473.49729,612.11739,473.49729,618.44821Z" transform="translate(-156 -212.36464)" fill="#fff"/><ellipse cx="623.94295" cy="586.26729" rx="10.15313" ry="32.34192" transform="translate(-304.12811 743.93025) rotate(-68.8237)" fill="#2f2e41"/><circle cx="532.7302" cy="382.74826" r="64.68385" fill="#2f2e41"/><rect x="698.5556" y="645.87743" width="19.65079" height="35.20766" transform="translate(1260.76198 1114.59789) rotate(-180)" fill="#2f2e41"/><rect x="659.25402" y="645.87743" width="19.65079" height="35.20766" transform="translate(1182.15883 1114.59789) rotate(-180)" fill="#2f2e41"/><ellipse cx="545.83073" cy="469.12985" rx="16.37566" ry="6.14087" fill="#2f2e41"/><ellipse cx="506.52915" cy="468.31107" rx="16.37566" ry="6.14087" fill="#2f2e41"/><circle cx="531.09264" cy="366.3726" r="22.10714" fill="#fff"/><circle cx="531.09264" cy="366.3726" r="7.36905" fill="#3f3d56"/><path d="M751.47572,534.95878c5.22292-23.39065-11.47266-47.02591-37.29064-52.79083s-50.9816,8.52354-56.20452,31.91418,11.88759,32.01752,37.70556,37.78245S746.25279,558.34942,751.47572,534.95878Z" transform="translate(-156 -212.36464)" fill="#6c63ff"/><ellipse cx="753.58578" cy="603.0993" rx="10.15313" ry="32.34192" transform="translate(-361.73544 497.14467) rotate(-45)" fill="#2f2e41"/><path d="M720.50271,618.44821c0,6.33082-16.30083,18.832-34.38888,18.832s-35.04764-17.82327-35.04764-24.15409,16.95958,1.22817,35.04764,1.22817S720.50271,612.11739,720.50271,618.44821Z" transform="translate(-156 -212.36464)" fill="#fff"/><path d="M1044,527.22724c0,41.80115-24.85012,56.39655-55.5043,56.39655s-55.5043-14.5954-55.5043-56.39655,55.5043-94.97881,55.5043-94.97881S1044,485.42608,1044,527.22724Z" transform="translate(-156 -212.36464)" fill="#e6e6e6"/><polygon points="830.474 364.865 831.042 329.881 854.699 286.601 831.131 324.393 831.387 308.663 847.691 277.35 831.454 304.5 831.454 304.5 831.914 276.209 849.373 251.28 831.986 271.76 832.273 219.884 830.469 288.559 830.617 285.726 812.866 258.555 830.332 291.164 828.678 322.761 828.629 321.922 808.166 293.329 828.567 324.885 828.36 328.836 828.323 328.896 828.34 329.22 824.144 409.383 829.751 409.383 830.423 367.977 850.775 336.499 830.474 364.865" fill="#3f3d56"/></svg>
</section>
<section class="d-flex flex-justify-center container-xl">
<div class="mt-6">
<h1 class="h000-mktg mt-6 mr-6">Catalyse your Web Components</h1>
<div class="d-flex">
<div class="">
<pre><code>
&lt;div data-controller=&quot;hello&quot;&gt;
&lt;input data-target=&quot;hello.name&quot; type=&quot;text&quot;&gt;
&lt;button data-action=&quot;click-&gt;hello#greet&quot;&gt;
Greet
&lt;/button&gt;
&lt;span data-target=&quot;hello.output&quot;&gt;
&lt;/span&gt;
&lt;/div&gt;
</code></pre>
</div>
<div class="">
<pre><code>
import { bindEvents, target, } from "@catalyst/core"
@register
@bindEvents
export default class extends Controller {
@target nameTarget: HTMLElement
@target outputTarget: HTMLElement
greet() {
this.outputTarget.textContent =
`Hello, ${this.nameTarget.value}!`
}
}
</code></pre>
</div>
</div>
</div>
</section>
</body>
</html>

23
site/primer.css Normal file

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

1
site/primer.css.map Normal file

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -1,11 +0,0 @@
export const getMethods = (obj: any) => {
let methods = []
for (const name of Object.getOwnPropertyNames(obj)) {
if (name === 'constructor') continue
const descriptor = Object.getOwnPropertyDescriptor(obj, name)
if (descriptor && descriptor.value && typeof descriptor.value === 'function') {
methods.push(name)
}
}
return methods
}