qugalet/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

add 'none' keyword to PISS shadow definiton that equals empty array

Browse source
This commit is contained in:
Henry Jameson 2024-09-24 00:23:25 +03:00
parent a8092de638
commit ab8907909b
5 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/button_unstyled.style.js
View file

@ -16,7 +16,8 @@ export default {
{ {
directives: { directives: {
background: '#ffffff', background: '#ffffff',
opacity: 0 opacity: 0,
shadow: []
} }
}, },
{ {

3
src/components/panel_header.style.js
View file

@ -16,7 +16,8 @@ export default {
component: 'PanelHeader', component: 'PanelHeader',
directives: { directives: {
backgroundNoCssColor: 'yes', backgroundNoCssColor: 'yes',
background: '--fg' background: '--fg',
shadow: []
} }
} }
] ]

4
src/services/theme_data/iss_deserializer.js
View file

@ -138,7 +138,11 @@ export const deserialize = (input) => {
const [property, value] = d.split(':') const [property, value] = d.split(':')
let realValue = value.trim() let realValue = value.trim()
if (property === 'shadow') { if (property === 'shadow') {
if (realValue === 'none') {
realValue = []
} else {
realValue = value.split(',').map(v => parseShadow(v.trim())) realValue = value.split(',').map(v => parseShadow(v.trim()))
}
} if (!Number.isNaN(Number(value))) { } if (!Number.isNaN(Number(value))) {
realValue = Number(value) realValue = Number(value)
} }

4
src/services/theme_data/iss_serializer.js
View file

@ -32,7 +32,11 @@ export const serialize = (ruleset) => {
} else { } else {
switch (directive) { switch (directive) {
case 'shadow': case 'shadow':
if (value.length > 0) {
return ` ${directive}: ${value.map(serializeShadow).join(', ')}` return ` ${directive}: ${value.map(serializeShadow).join(', ')}`
} else {
return ` ${directive}: none`
}
default: default:
return ` ${directive}: ${value}` return ` ${directive}: ${value}`
} }

4
test/unit/specs/services/theme_data/iss_deserializer.spec.js
View file

@ -19,7 +19,7 @@ describe('ISS (de)serialization', () => {
/* /*
// Debug snippet // Debug snippet
const onlyComponent = componentsContext('./components/panel_header.style.js').default const onlyComponent = componentsContext('./components/panel_header.style.js').default
it(`(De)serialization of component ${onlyComponent.name} works`, () => { it.only(`(De)serialization of component ${onlyComponent.name} works`, () => {
const normalized = onlyComponent.defaultRules.map(x => ({ component: onlyComponent.name, ...x })) const normalized = onlyComponent.defaultRules.map(x => ({ component: onlyComponent.name, ...x }))
console.log('BEGIN INPUT ================') console.log('BEGIN INPUT ================')
console.log(normalized) console.log(normalized)
@ -36,5 +36,5 @@ describe('ISS (de)serialization', () => {
// for some reason comparing objects directly fails the assert // for some reason comparing objects directly fails the assert
expect(JSON.stringify(deserialized, null, 2)).to.equal(JSON.stringify(normalized, null, 2)) expect(JSON.stringify(deserialized, null, 2)).to.equal(JSON.stringify(normalized, null, 2))
}) })
*/ /* */
}) })