fixed null access on `meta`

master v0.3.3
Michael Ochmann 2 years ago
parent 14c8849c25
commit df6fdbcdf8
  1. 8
      src/ui/src/components/Ation.js
  2. 8
      src/ui/src/components/SlidesList.js

@ -58,11 +58,11 @@ const Ation = () => {
<Toolbar openFile={openFile} setShowTips={setShowTips} version={version} />
<SlidesList deck={deck} meta={meta} font={font} />
<main className="main" style={{
"--color-hightlight" : meta.color_highlight || highlightColor,
"--color-slideBackground" : meta.color_background || backgroundColor,
"--color-slideForeground" : meta.color_text || color
"--color-hightlight" : meta?.color_highlight || highlightColor,
"--color-slideBackground" : meta?.color_background || backgroundColor,
"--color-slideForeground" : meta?.color_text || color
}}>
<Slide data={deck[slide] || null} style={{fontFamily : meta.font || font}}/>
<Slide data={deck[slide] || null} style={{fontFamily : meta?.font || font}}/>
</main>
<Tips show={showTips} />
</section>

@ -50,13 +50,13 @@ const SlidesList = ({deck, meta, font, style}) => {
return (
<aside className="slides-list" ref={container} style={{
"--color-hightlight" : meta.color_highlight || highlightColor,
"--color-slideBackground" : meta.color_background || backgroundColor,
"--color-slideForeground" : meta.color_text || color
"--color-hightlight" : meta?.color_highlight || highlightColor,
"--color-slideBackground" : meta?.color_background || backgroundColor,
"--color-slideForeground" : meta?.color_text || color
}}>
{deck.map((currentSlide, index) => (
<div className="slide-wrap" key={index}>
<Slide data={currentSlide} className={index === slide ? "active" : ""} style={{transform : `scale(${scale}) translateX(0)`, fontFamily: meta.font || font}} onClick={() => setSlide(index)} ref={index === slide ? current : null} />
<Slide data={currentSlide} className={index === slide ? "active" : ""} style={{transform : `scale(${scale}) translateX(0)`, fontFamily: meta?.font || font}} onClick={() => setSlide(index)} ref={index === slide ? current : null} />
</div>
))}
</aside>

Loading…
Cancel
Save