leaflet.pub
a tool for shared writing and social publishing
merge blockprops style better
awarm.space
+5
-5
+5
-5
app/lish/[did]/[publication]/[rkey]/PostContent.tsx
+5
-5
app/lish/[did]/[publication]/[rkey]/PostContent.tsx
···
347
347
case PubLeafletBlocksText.isMain(b.block):
348
348
return (
349
349
<p
350
-
style={{ fontSize: blockTextSize.p }}
351
350
className={`textBlock ${className} ${b.block.textSize === "small" ? "text-sm text-secondary" : b.block.textSize === "large" ? "text-lg" : ""}`}
352
351
{...blockProps}
352
+
style={{ ...blockProps.style, fontSize: blockTextSize.p }}
353
353
>
354
354
<TextBlock
355
355
facets={b.block.facets}
···
364
364
case PubLeafletBlocksHeader.isMain(b.block): {
365
365
if (b.block.level === 1)
366
366
return (
367
-
<h1 style={{ fontSize: blockTextSize.h1 }} className={`h1Block ${className}`} {...blockProps}>
367
+
<h1 className={`h1Block ${className}`} {...blockProps} style={{ ...blockProps.style, fontSize: blockTextSize.h1 }}>
368
368
<TextBlock
369
369
{...b.block}
370
370
index={index}
···
375
375
);
376
376
if (b.block.level === 2)
377
377
return (
378
-
<h2 style={{ fontSize: blockTextSize.h2 }} className={`h2Block ${className}`} {...blockProps}>
378
+
<h2 className={`h2Block ${className}`} {...blockProps} style={{ ...blockProps.style, fontSize: blockTextSize.h2 }}>
379
379
<TextBlock
380
380
{...b.block}
381
381
index={index}
···
386
386
);
387
387
if (b.block.level === 3)
388
388
return (
389
-
<h3 style={{ fontSize: blockTextSize.h3 }} className={`h3Block ${className}`} {...blockProps}>
389
+
<h3 className={`h3Block ${className}`} {...blockProps} style={{ ...blockProps.style, fontSize: blockTextSize.h3 }}>
390
390
<TextBlock
391
391
{...b.block}
392
392
index={index}
···
398
398
// if (b.block.level === 4) return <h4>{b.block.plaintext}</h4>;
399
399
// if (b.block.level === 5) return <h5>{b.block.plaintext}</h5>;
400
400
return (
401
-
<h6 style={{ fontSize: blockTextSize.h4 }} className={`h6Block ${className}`} {...blockProps}>
401
+
<h6 className={`h6Block ${className}`} {...blockProps} style={{ ...blockProps.style, fontSize: blockTextSize.h4 }}>
402
402
<TextBlock
403
403
{...b.block}
404
404
index={index}