Merge pull request #242 from KevinBatdorf/add-explicit-defaults

Add explicit defaults

readme.txt

@@ -312,7 +312,8 @@ Themes are rendered inside the editor as you type or make changes, so the code b
 
 = 1.24.0 - 2023-09-02 =
 - Feature: Added Zig, mdc, Mojo, shellsession (console output), and splunk grammars
-- Tweak: Combine code aliases
+- Tweak: Combined confusing code aliases
+- Fix: Fixed a bug where a setting would affect every block on the same page
 
 = 1.23.0 - 2023-08-13 =
 - Feature: Added Imba syntax

src/hooks/useDefaults.ts

@@ -56,112 +56,97 @@ export const useDefaults = ({
 
  useEffect(() => {
  if (once.current) return;
- if (copyButtonType || !previousCopyButtonType) return;
+ if (copyButtonType) return;
  setAttributes({ copyButtonType: previousCopyButtonType });
  }, [previousCopyButtonType, copyButtonType, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
- if (theme || !previousTheme) return;
+ if (theme) return;
  setAttributes({ theme: previousTheme as Theme });
  }, [previousTheme, theme, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
- if (fontSize || !previousFontSize) return;
+ if (fontSize) return;
  setAttributes({ fontSize: previousFontSize });
  }, [previousFontSize, fontSize, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
- if (fontFamily || fontFamily === '' || previousFontFamily === undefined)
- return;
+ if (fontFamily || fontFamily === '') return;
  setAttributes({ fontFamily: previousFontFamily });
  }, [previousFontFamily, fontFamily, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
- if (lineHeight || !previousLineHeight) return;
+ if (lineHeight) return;
  setAttributes({ lineHeight: previousLineHeight });
  }, [previousLineHeight, lineHeight, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
- if (headerType || !previousHeaderType) return;
+ if (headerType) return;
  setAttributes({ headerType: previousHeaderType });
  }, [previousHeaderType, headerType, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
- if (footerType !== undefined || previousFooterType === undefined)
- return;
+ if (footerType !== undefined) return;
  setAttributes({ footerType: previousFooterType });
  }, [previousFooterType, footerType, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
- if (clampFonts !== undefined || previousClampFonts === undefined)
- return;
+ if (clampFonts !== undefined) return;
  setAttributes({ clampFonts: previousClampFonts });
  }, [previousClampFonts, clampFonts, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
- if (
- disablePadding !== undefined ||
- previousDisablePadding === undefined
- )
- return;
+ if (disablePadding !== undefined) return;
  setAttributes({ disablePadding: previousDisablePadding });
  }, [previousDisablePadding, disablePadding, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
- if (lineNumbers !== undefined || previousLineNumbers === undefined)
- return;
+ if (lineNumbers !== undefined) return;
  setAttributes({ lineNumbers: previousLineNumbers });
  }, [previousLineNumbers, lineNumbers, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
- if (tabSize !== undefined || previousTabSize === undefined) return;
+ if (tabSize !== undefined) return;
  setAttributes({ tabSize: previousTabSize });
  }, [previousTabSize, tabSize, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
- if (useTabs !== undefined || previousUseTabs === undefined) return;
+ if (useTabs !== undefined) return;
  setAttributes({ useTabs: previousUseTabs });
  }, [previousUseTabs, useTabs, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
  if (seeMoreType !== undefined) return;
- if (previousSeeMoreType === undefined) return;
  setAttributes({ seeMoreType: previousSeeMoreType });
  }, [previousSeeMoreType, seeMoreType, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
  if (seeMoreString !== undefined) return;
- if (previousSeeMoreString === undefined) return;
  setAttributes({ seeMoreString: previousSeeMoreString });
  }, [previousSeeMoreString, seeMoreString, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
  if (seeMoreTransition !== undefined) return;
- if (previousSeeMoreTransition === undefined) return;
  setAttributes({ seeMoreTransition: previousSeeMoreTransition });
  }, [previousSeeMoreTransition, seeMoreTransition, setAttributes]);
 
  useEffect(() => {
  if (once.current) return;
- if (
- highlightingHover !== undefined ||
- previousHighlightingHover === undefined
- )
- return;
+ if (highlightingHover !== undefined) return;
  setAttributes({ highlightingHover: previousHighlightingHover });
  }, [previousHighlightingHover, highlightingHover, setAttributes]);
 

src/state/theme.ts

@@ -39,21 +39,21 @@ const defaultSettings = {
  previousFontFamily: 'Code-Pro-JetBrains-Mono',
  previousFontSize: '.875rem',
  previousHeaderType: 'headlights',
- previousFooterType: undefined,
- previousClampFonts: undefined,
- previousDisablePadding: undefined,
- previousLineNumbers: undefined,
- previousHighlightingHover: undefined,
+ previousFooterType: 'none',
+ previousClampFonts: false,
+ previousDisablePadding: false,
+ previousLineNumbers: false,
+ previousHighlightingHover: false,
  previousCopyButton: true,
  previousCopyButtonType: 'heroicons',
  previousTabSize: 2,
- previousUseTabs: undefined,
+ previousUseTabs: false,
  // TODO: maybe impliment these with an extra UI to make them optional
  // previousEnableMaxHeight: undefined,
  // previousSeeMoreAfterLine: undefined,
- previousSeeMoreType: undefined,
- previousSeeMoreString: undefined,
- previousSeeMoreTransition: undefined,
+ previousSeeMoreType: '',
+ previousSeeMoreString: '',
+ previousSeeMoreTransition: false,
 };
 const storage = {
  getItem: async (name: string) => {