Skip to content

Commit 8430313

Browse files
committed
fix
1 parent ece0ce6 commit 8430313

File tree

2 files changed

+27
-8
lines changed

2 files changed

+27
-8
lines changed

web_src/js/features/common-button.test.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
1-
import {assignElementProperty} from './common-button.ts';
1+
import {assignElementProperty, type ElementWithAssignableProperties} from './common-button.ts';
22

33
test('assignElementProperty', () => {
44
const elForm = document.createElement('form');
55
assignElementProperty(elForm, 'action', '/test-link');
66
expect(elForm.action).contains('/test-link'); // the DOM always returns absolute URL
7+
expect(elForm.getAttribute('action')).eq('/test-link');
78
assignElementProperty(elForm, 'text-content', 'dummy');
89
expect(elForm.textContent).toBe('dummy');
910

11+
// mock a form with its property "action" overwritten by an input element
12+
const elFormWithAction = new class implements ElementWithAssignableProperties {
13+
action = document.createElement('input'); // now "form.action" is not string, but an input element
14+
_attrs: Record<string, string> = {};
15+
setAttribute(name: string, value: string) { this._attrs[name] = value }
16+
getAttribute(name: string): string | null { return this._attrs[name] }
17+
}();
18+
assignElementProperty(elFormWithAction, 'action', '/bar');
19+
expect(elFormWithAction.getAttribute('action')).eq('/bar');
20+
1021
const elInput = document.createElement('input');
1122
expect(elInput.readOnly).toBe(false);
1223
assignElementProperty(elInput, 'read-only', 'true');

web_src/js/features/common-button.ts

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,26 @@ function onHidePanelClick(el: HTMLElement, e: MouseEvent) {
109109
throw new Error('no panel to hide'); // should never happen, otherwise there is a bug in code
110110
}
111111

112-
export function assignElementProperty(el: any, name: string, val: string) {
113-
name = camelize(name);
114-
const old = el[name];
112+
export type ElementWithAssignableProperties = {
113+
getAttribute: (name: string) => string | null;
114+
setAttribute: (name: string, value: string) => void;
115+
} & Record<string, any>
116+
117+
export function assignElementProperty(el: ElementWithAssignableProperties, kebabName: string, val: string) {
118+
const camelizedName = camelize(kebabName);
119+
const old = el[camelizedName];
115120
if (typeof old === 'boolean') {
116-
el[name] = val === 'true';
121+
el[camelizedName] = val === 'true';
117122
} else if (typeof old === 'number') {
118-
el[name] = parseFloat(val);
123+
el[camelizedName] = parseFloat(val);
119124
} else if (typeof old === 'string') {
120-
el[name] = val;
125+
el[camelizedName] = val;
126+
} else if (old?.nodeName) {
127+
// "form" has an edge case: its "<input name=action>" element overwrites the "action" property, we can only set attribute
128+
el.setAttribute(kebabName, val);
121129
} else {
122130
// in the future, we could introduce a better typing system like `data-modal-form.action:string="..."`
123-
throw new Error(`cannot assign element property ${name} by value ${val}`);
131+
throw new Error(`cannot assign element property "${camelizedName}" by value "${val}"`);
124132
}
125133
}
126134

0 commit comments

Comments
 (0)