Skip to content
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.

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

TodoMVC web component: change css rule, run build on complex #326

Merged
merged 2 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion resources/todomvc/todomvc-css/dist/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ but useful for people who use screen readers */
}

.todo-item-text {
word-break: break-all;
overflow-wrap: break-word;
padding: 0 60px;
display: block;
line-height: 60px;
Expand Down
2 changes: 1 addition & 1 deletion resources/todomvc/todomvc-css/dist/index.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ sheet.replaceSync(`:host {
}

.todo-item-text {
word-break: break-all;
overflow-wrap: break-word;
padding: 0 60px;
display: block;
line-height: 60px;
Expand Down
2 changes: 1 addition & 1 deletion resources/todomvc/todomvc-css/dist/todo-item.css
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
}

.todo-item-text {
word-break: break-all;
overflow-wrap: break-word;
padding: 0 60px;
display: block;
line-height: 60px;
Expand Down
2 changes: 1 addition & 1 deletion resources/todomvc/todomvc-css/dist/todo-item.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
}

.todo-item-text {
word-break: break-all;
overflow-wrap: break-word;
padding: 0 60px;
display: block;
line-height: 60px;
Expand Down
2 changes: 1 addition & 1 deletion resources/todomvc/todomvc-css/src/css/todo-item.css
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
}

.todo-item-text {
word-break: break-all;
overflow-wrap: break-word;
padding: 0 60px;
display: block;
line-height: 60px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@ import itemStyles from "../../styles/todo-item.constructable.js";

class TodoItem extends HTMLElement {
static get observedAttributes() {
return ["id", "title", "completed"];
return ["itemid", "itemtitle", "itemcompleted"];
}

constructor() {
super();

this.id = "";
this.title = "Todo Item";
this.completed = "false";
// Renamed this.id to this.itemid and this.title to this.itemtitle.
// When the component assigns to this.id or this.title, this causes the browser's implementation of the existing setters to run, which convert these property sets into internal setAttribute calls. This can have surprising consequences.
// [Issue]: https://github.com/WebKit/Speedometer/issues/313
this.itemid = "";
this.itemtitle = "Todo Item";
this.itemcompleted = "false";

const node = document.importNode(template.content, true);
this.item = node.querySelector(".todo-item");
Expand Down Expand Up @@ -51,26 +54,26 @@ class TodoItem extends HTMLElement {
update(...args) {
args.forEach((argument) => {
switch (argument) {
case "id":
if (this.id !== undefined)
this.item.id = `todo-item-${this.id}`;
case "itemid":
if (this.itemid !== undefined)
this.item.id = `todo-item-${this.itemid}`;
break;
case "title":
if (this.title !== undefined) {
this.todoText.textContent = this.title;
this.editInput.value = this.title;
case "itemtitle":
if (this.itemtitle !== undefined) {
this.todoText.textContent = this.itemtitle;
this.editInput.value = this.itemtitle;
}
break;
case "completed":
this.toggleInput.checked = this.completed === "true" ? true : false;
case "itemcompleted":
this.toggleInput.checked = this.itemcompleted === "true" ? true : false;
break;
}
});
}

startEdit() {
this.item.classList.add("editing");
this.editInput.value = this.title;
this.editInput.value = this.itemtitle;
this.editInput.focus();
}

Expand All @@ -85,11 +88,11 @@ class TodoItem extends HTMLElement {
toggleItem() {
// The todo-list checks the "completed" attribute to filter based on route
// (therefore the completed state needs to already be updated before the check)
this.setAttribute("completed", this.toggleInput.checked);
this.setAttribute("itemcompleted", this.toggleInput.checked);

this.dispatchEvent(
new CustomEvent("toggle-item", {
detail: { id: this.id, completed: this.toggleInput.checked },
detail: { id: this.itemid, completed: this.toggleInput.checked },
bubbles: true,
})
);
Expand All @@ -100,22 +103,22 @@ class TodoItem extends HTMLElement {
// (therefore the removal has to happen after the list is updated)
this.dispatchEvent(
new CustomEvent("remove-item", {
detail: { id: this.id },
detail: { id: this.itemid },
bubbles: true,
})
);
this.remove();
}

updateItem(event) {
if (event.target.value !== this.title) {
if (event.target.value !== this.itemtitle) {
if (!event.target.value.length) {
this.removeItem();
} else {
this.setAttribute("title", event.target.value);
this.setAttribute("itemtitle", event.target.value);
this.dispatchEvent(
new CustomEvent("update-item", {
detail: { id: this.id, title: event.target.value },
detail: { id: this.itemid, title: event.target.value },
bubbles: true,
})
);
Expand Down Expand Up @@ -153,7 +156,7 @@ class TodoItem extends HTMLElement {
}

connectedCallback() {
this.update("id", "title", "completed");
this.update("itemid", "itemtitle", "itemcompleted");

this.keysListeners.push(
useKeyListener({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,12 @@ class TodoList extends HTMLElement {
}

addItem(entry) {
const { id, title, completed } = entry;
const element = new TodoItem();
Object.keys(entry).forEach((key) => element.setAttribute(key, entry[key]));

element.setAttribute("itemid", id);
element.setAttribute("itemtitle", title);
element.setAttribute("itemcompleted", completed);

const elementIndex = this.#elements.length;
this.#elements.push(element);
Expand All @@ -48,18 +52,18 @@ class TodoList extends HTMLElement {

removeCompletedItems() {
this.#elements = this.#elements.filter((element) => {
if (element.completed === "true")
if (element.itemcompleted === "true")
element.removeItem();

return element.completed === "false";
return element.itemcompleted === "false";
});
}

toggleItems(completed) {
this.#elements.forEach((element) => {
if (completed && element.completed === "false")
if (completed && element.itemcompleted === "false")
element.toggleInput.click();
else if (!completed && element.completed === "true")
else if (!completed && element.itemcompleted === "true")
element.toggleInput.click();
});
}
Expand All @@ -74,10 +78,10 @@ class TodoList extends HTMLElement {
updateView(element) {
switch (this.#route) {
case "completed":
element.style.display = element.completed === "true" ? "block" : "none";
element.style.display = element.itemcompleted === "true" ? "block" : "none";
break;
case "active":
element.style.display = element.completed === "true" ? "none" : "block";
element.style.display = element.itemcompleted === "true" ? "none" : "block";
break;
default:
element.style.display = "block";
Expand All @@ -92,13 +96,12 @@ class TodoList extends HTMLElement {
case "toggle-item":
case "add-item":
this.#elements.forEach((element) => {
if (element.id === id)
if (element.itemid === id)
this.updateView(element);
});
break;
case "remove-item":
this.#elements = this.#elements.filter((element) => element.id !== id);

this.#elements = this.#elements.filter((element) => element.itemid !== id);
break;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ sheet.replaceSync(`:host {
}

.todo-item-text {
word-break: break-all;
overflow-wrap: break-word;
padding: 0 60px;
display: block;
line-height: 60px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ sheet.replaceSync(`:host {
}

.todo-item-text {
word-break: break-all;
overflow-wrap: break-word;
padding: 0 60px;
display: block;
line-height: 60px;
Expand Down