Skip to content

Commit 7fc238a

Browse files
committed
update package
1 parent 6c5f129 commit 7fc238a

21 files changed

+55
-55
lines changed

demos/autocomplete.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class Autocomplete extends Component
5151
},
5252
]);
5353

54-
this.afterAttachToDom.subscribe(() => {
54+
this.afterAttach.subscribe(() => {
5555
$(inputElement$._()).autocomplete({
5656
source: (request, response) => {
5757
getSuggestions(request.term).then(response);
@@ -63,7 +63,7 @@ class Autocomplete extends Component
6363
});
6464
});
6565

66-
this.beforeDetachFromDom.subscribe(() => {
66+
this.beforeDetach.subscribe(() => {
6767
$(inputElement$._()).autocomplete('destroy');
6868
});
6969

demos/components/GoToTop.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class GoToTop extends Component
1818

1919
const scrollStream = createStreamOfDomEvent(document, 'scroll');
2020
scrollStream.subscribe(throttledChangeVisibility);
21-
this.beforeDetachFromDom.subscribe(scrollStream.unsubscribe);
21+
this.beforeDetach.subscribe(scrollStream.unsubscribe);
2222

2323
return parseHTML([
2424
'<button>', {

demos/dynamic-title.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class DynamicTitle extends Component
1111
const titleText$ = createStore('Dynamic Title');
1212
const [ element ] = parseHTML([ '<title>', [ titleText$ ], '</title>' ]);
1313

14-
this.afterAttachToDom.subscribe(() => {
14+
this.afterAttach.subscribe(() => {
1515
element.setup();
1616
hydrateComponentChildren([element], document.getElementsByTagName('title')[0]);
1717
element.setupDom();

demos/form.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import parseHTML from "../node_modules/@xylem-js/xylem-js/dom/parseHTML.js";
2-
import combineNamedSuppliers from "../node_modules/@xylem-js/xylem-js/core/combineNamedSuppliers.js";
2+
import combineNamed from "../node_modules/@xylem-js/xylem-js/core/combineNamed.js";
33
import Component from "../node_modules/@xylem-js/xylem-js/dom/Component.js";
44
import createStore from "../node_modules/@xylem-js/xylem-js/core/createStore.js";
55
import forEach from "../node_modules/@xylem-js/xylem-js/dom/forEach.js";
@@ -27,15 +27,15 @@ class Form extends Component
2727

2828
const selectedMultiCheckboxes$ = map(
2929
this,
30-
combineNamedSuppliers(this, multiCheckboxChecked$s),
30+
combineNamed(this, multiCheckboxChecked$s),
3131
(values) => Object.keys(values).reduce((acc, key) => {
3232
if (values[key]) {
3333
acc.push(key);
3434
}
3535
return acc;
3636
}, [])
3737
);
38-
const formData$ = combineNamedSuppliers(this, {
38+
const formData$ = combineNamed(this, {
3939
input: inputValue$,
4040
textarea: textareaValue$,
4141
singleSelect: singleSelectSelected$,

demos/gallery.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/dom/forEach.js">
3535
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/dom/_internal/applyNativeComponentMixin.js">
3636
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/utilities/getValue.js">
37-
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/core/combineNamedSuppliers.js">
37+
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/core/combineNamed.js">
3838
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/core/map.js">
3939
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/dom/_internal/ForEachBlock.js">
4040
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/dom/_internal/IfElseBlock.js">
4141
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/dom/_internal/ForEachBlockItem.js">
4242
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/dom/_internal/IfElseBlockItem.js">
43-
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/core/combineSuppliers.js">
43+
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/core/combine.js">
4444
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/array_action/push.js">
4545
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/array_action/remove.js">
4646
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/array_action/unshift.js">

demos/ignore-promise-result.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class IgnorePromiseResult extends Component
3737
const responseCount$ = createStore(0);
3838
const unsubscribe$ = createStore(null);
3939
const setUnsubscribe$ = createSetUnsubscribe$(unsubscribe$);
40-
this.beforeDetachFromDom.subscribe(() => setUnsubscribe$(null));
40+
this.beforeDetach.subscribe(() => setUnsubscribe$(null));
4141

4242
return parseHTML([
4343
'<div>',

demos/invoice.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import combineNamedSuppliers from "../node_modules/@xylem-js/xylem-js/core/combineNamedSuppliers.js";
1+
import combineNamed from "../node_modules/@xylem-js/xylem-js/core/combineNamed.js";
22
import Component from "../node_modules/@xylem-js/xylem-js/dom/Component.js";
33
import createArrayStore from "../node_modules/@xylem-js/xylem-js/array/createArrayStore.js";
44
import createSupplier from "../node_modules/@xylem-js/xylem-js/core/createSupplier.js";
@@ -25,7 +25,7 @@ function getTableEntry(index)
2525
const productName$ = createStore(`Item ${index + 1}`);
2626
const quantity$ = createStore('1');
2727
const rate$ = createStore('');
28-
const price$ = map(new FakeLifecycle, combineNamedSuppliers(new FakeLifecycle, {
28+
const price$ = map(new FakeLifecycle, combineNamed(new FakeLifecycle, {
2929
quantity: quantity$,
3030
rate: rate$
3131
}), (v) => isNumericString(v.quantity) && isNumericString(v.rate) ? v.quantity * v.rate : null);
@@ -44,7 +44,7 @@ class Invoice extends Component
4444
{
4545
const tableData$ = createArrayStore(Array.apply(null, Array(5)).map((_, index) => getTableEntry(index)));
4646

47-
const normalizedTableData$ = normalizeArrayStore(tableData$, (row) => combineNamedSuppliers(this, {
47+
const normalizedTableData$ = normalizeArrayStore(tableData$, (row) => combineNamed(this, {
4848
productName: row.productName$,
4949
quantity: row.quantity$,
5050
rate: row.rate$,
@@ -60,7 +60,7 @@ class Invoice extends Component
6060
totalPrice$: totalPrice$
6161
};
6262
console.log('viewModel', viewModel);
63-
const normalizedModel$ = combineNamedSuppliers(this, {
63+
const normalizedModel$ = combineNamed(this, {
6464
tableData: normalizedTableData$,
6565
totalPrice: createSupplier(totalPrice$, createEmittableStream()),
6666
});

demos/resume.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Component from "../node_modules/@xylem-js/xylem-js/dom/Component.js";
22
import createArrayStore from "../node_modules/@xylem-js/xylem-js/array/createArrayStore.js";
33
import createStore from "../node_modules/@xylem-js/xylem-js/core/createStore.js";
4-
import combineSuppliers from "../node_modules/@xylem-js/xylem-js/core/combineSuppliers.js";
5-
import combineNamedSuppliers from "../node_modules/@xylem-js/xylem-js/core/combineNamedSuppliers.js";
4+
import combine from "../node_modules/@xylem-js/xylem-js/core/combine.js";
5+
import combineNamed from "../node_modules/@xylem-js/xylem-js/core/combineNamed.js";
66
import flow from "../node_modules/lodash-es/flow.js";
77
import forEach from "../node_modules/@xylem-js/xylem-js/dom/forEach.js";
88
import if_ from "../node_modules/@xylem-js/xylem-js/dom/if_.js";
@@ -222,7 +222,7 @@ class ResumeForm extends Component
222222
build(attrs)
223223
{
224224
const { resume$, onSave } = attrs;
225-
this.beforeDetachFromDom.subscribe(
225+
this.beforeDetach.subscribe(
226226
resume$.subscribe((v) => {
227227
fullName$._(v.fullName);
228228
fullNameInputElement$._().value = v.fullName;
@@ -246,15 +246,15 @@ class ResumeForm extends Component
246246
const address$ = createStore(resume.address);
247247
const projects$ = createArrayStore(resume.projects.map(getProjectViewModel));
248248

249-
const normalizedProjects$ = normalizeArrayStore(projects$, (project) => combineNamedSuppliers(this, {
249+
const normalizedProjects$ = normalizeArrayStore(projects$, (project) => combineNamed(this, {
250250
title: project.title$,
251251
description: project.description$,
252252
completionDate: project.completionDate$,
253253
skills: normalizeArrayStore(project.skills$, v => v),
254254
url: project.url$,
255255
}));
256256

257-
const normalizedResume$ = combineNamedSuppliers(this, {
257+
const normalizedResume$ = combineNamed(this, {
258258
fullName: fullName$,
259259
email: email$,
260260
address: address$,
@@ -427,7 +427,7 @@ class ResumeForm extends Component
427427
class: 'input-group-text',
428428
for: map(
429429
this,
430-
combineSuppliers(this, [index$, index$2]),
430+
combine(this, [index$, index$2]),
431431
([i,i2])=>`project-${i}-skill-${i2}`,
432432
),
433433
},
@@ -437,7 +437,7 @@ class ResumeForm extends Component
437437
class: 'form-control',
438438
id: map(
439439
this,
440-
combineSuppliers(this, [index$, index$2]),
440+
combine(this, [index$, index$2]),
441441
([i,i2])=>`project-${i}-skill-${i2}`,
442442
),
443443
value: skill$._(),

demos/todo-list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/dom/Component.js">
1111
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/array/createArrayStore.js">
1212
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/core/createStore.js">
13-
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/core/combineNamedSuppliers.js">
13+
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/core/combineNamed.js">
1414
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/dom/forEach.js">
1515
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/dom/if_.js">
1616
<link rel="modulepreload" href="../node_modules/@xylem-js/xylem-js/core/map.js">

demos/todo-list.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Component from "../node_modules/@xylem-js/xylem-js/dom/Component.js";
22
import createArrayStore from "../node_modules/@xylem-js/xylem-js/array/createArrayStore.js";
33
import createStore from "../node_modules/@xylem-js/xylem-js/core/createStore.js";
4-
import combineNamedSuppliers from "../node_modules/@xylem-js/xylem-js/core/combineNamedSuppliers.js";
4+
import combineNamed from "../node_modules/@xylem-js/xylem-js/core/combineNamed.js";
55
import forEach from "../node_modules/@xylem-js/xylem-js/dom/forEach.js";
66
import GoToTop from "./components/GoToTop.js";
77
import if_ from "../node_modules/@xylem-js/xylem-js/dom/if_.js";
@@ -58,12 +58,12 @@ class TodoComponent extends Component
5858
todos$._(getTodoList(count));
5959
}
6060

61-
const normalizedTodos$ = normalizeArrayStore(todos$, (todo) => combineNamedSuppliers(this, {
61+
const normalizedTodos$ = normalizeArrayStore(todos$, (todo) => combineNamed(this, {
6262
text: createStore(todo.text),
6363
isCompleted: todo.isCompleted$
6464
}));
6565

66-
const normalizedModel$ = combineNamedSuppliers(this, {
66+
const normalizedModel$ = combineNamed(this, {
6767
newTodo: newTodo$,
6868
todos: normalizedTodos$
6969
});

0 commit comments

Comments
 (0)