pleroma-fe

commit: cf24e3009512ab4b86a600837f255fe86b9a5b0d
parent a8092de63808ff1445636f07e11f3602774f1438
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Mon, 23 Sep 2024 21:33:19 +0000

Merge branch 'fix-shadows-everywhere' into 'develop'

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

See merge request pleroma/pleroma-fe!1946
Diffstat:
A
changelog.d/piss-fix.skip
0

M
src/components/button_unstyled.style.js
3
++-
M
src/components/panel_header.style.js
3
++-
M
src/services/theme_data/iss_deserializer.js
6
+++++-
M
src/services/theme_data/iss_serializer.js
6
+++++-
M
test/unit/specs/services/theme_data/iss_deserializer.spec.js
4
++--

6 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/changelog.d/piss-fix.skip b/changelog.d/piss-fix.skip
diff --git a/src/components/button_unstyled.style.js b/src/components/button_unstyled.style.js
@@ -16,7 +16,8 @@ export default {
     {
       directives: {
         background: '#ffffff',
-        opacity: 0
+        opacity: 0,
+        shadow: []
       }
     },
     {
diff --git a/src/components/panel_header.style.js b/src/components/panel_header.style.js
@@ -16,7 +16,8 @@ export default {
       component: 'PanelHeader',
       directives: {
         backgroundNoCssColor: 'yes',
-        background: '--fg'
+        background: '--fg',
+        shadow: []
       }
     }
   ]
diff --git a/src/services/theme_data/iss_deserializer.js b/src/services/theme_data/iss_deserializer.js
@@ -138,7 +138,11 @@ export const deserialize = (input) => {
         const [property, value] = d.split(':')
         let realValue = value.trim()
         if (property === 'shadow') {
-          realValue = value.split(',').map(v => parseShadow(v.trim()))
+          if (realValue === 'none') {
+            realValue = []
+          } else {
+            realValue = value.split(',').map(v => parseShadow(v.trim()))
+          }
         } if (!Number.isNaN(Number(value))) {
           realValue = Number(value)
         }
diff --git a/src/services/theme_data/iss_serializer.js b/src/services/theme_data/iss_serializer.js
@@ -32,7 +32,11 @@ export const serialize = (ruleset) => {
       } else {
         switch (directive) {
           case 'shadow':
-            return `  ${directive}: ${value.map(serializeShadow).join(', ')}`
+            if (value.length > 0) {
+              return `  ${directive}: ${value.map(serializeShadow).join(', ')}`
+            } else {
+              return `  ${directive}: none`
+            }
           default:
             return `  ${directive}: ${value}`
         }
diff --git a/test/unit/specs/services/theme_data/iss_deserializer.spec.js b/test/unit/specs/services/theme_data/iss_deserializer.spec.js
@@ -19,7 +19,7 @@ describe('ISS (de)serialization', () => {
   /*
   // Debug snippet
   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 }))
     console.log('BEGIN INPUT ================')
     console.log(normalized)
@@ -36,5 +36,5 @@ describe('ISS (de)serialization', () => {
     // for some reason comparing objects directly fails the assert
     expect(JSON.stringify(deserialized, null, 2)).to.equal(JSON.stringify(normalized, null, 2))
   })
-  */
+  /* */
 })