Skip to content

fix: keep prototype-named classes without string mappings #593

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.

Sign up for GitHub

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

Open
feritcemkahraman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: keep prototype-named classes without string mappings #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions bind.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export default function classNames () {

function parseValue (arg) {
if (typeof arg === 'string') {
return this && this[arg] || arg;
const mappedClass = this && this[arg];
return typeof mappedClass === 'string' && mappedClass || arg;
}

if (typeof arg !== 'object') {
Expand All @@ -34,7 +35,8 @@ function parseValue (arg) {

for (const key in arg) {
if (hasOwn.call(arg, key) && arg[key]) {
classes = appendClass(classes, this && this[key] || key);
const mappedClass = this && this[key];
classes = appendClass(classes, typeof mappedClass === 'string' && mappedClass || key);
}
}

Expand Down
25 changes: 25 additions & 0 deletions tests/bind.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,31 @@ describe('bind', () => {
});

describe('classNamesBound', () => {
it('keeps unmapped string classes that match Object.prototype properties', () => {
for (const name of ['toString', 'constructor', 'hasOwnProperty', '__proto__']) {
assert.equal(classNamesBound(name), name);
assert.equal(classNamesBound([name]), name);
assert.equal(classNamesBound('a', name), '#a ' + name);
}
});

it('keeps unmapped object keys that match Object.prototype properties', () => {
for (const name of ['constructor', 'hasOwnProperty', '__proto__']) {
assert.equal(classNamesBound({[name]: true}), name);
}
});

it('uses string mappings for prototype-named and inherited classes', () => {
const mappings = Object.setPrototypeOf({
toString: '#toString', constructor: '#constructor', ['__proto__']: '#proto'
}, {inherited: '#inherited'});
const bound = classNames.bind(mappings);
assert.equal(bound('toString', 'constructor', '__proto__', 'inherited'),
'#toString #constructor #proto #inherited');
assert.equal(bound({constructor: true, ['__proto__']: true, inherited: true}),
'#constructor #proto #inherited');
});

it('keeps object keys with truthy values', () => {
assert.equal(classNamesBound({
a: true,
Expand Down