gatsby-theme-q3 3.8.15 → 3.9.0

package/CHANGELOG.md

@@ -3,47 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [3.8.15](https://github.com/3merge/q/compare/v3.8.14...v3.8.15) (2022-08-15)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-## [3.8.12](https://github.com/3merge/q/compare/v3.8.11...v3.8.12) (2022-08-02)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-## [3.8.9](https://github.com/3merge/q/compare/v3.8.8...v3.8.9) (2022-07-29)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-## [3.8.6](https://github.com/3merge/q/compare/v3.8.5...v3.8.6) (2022-07-27)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-## [3.8.3](https://github.com/3merge/q/compare/v3.8.2...v3.8.3) (2022-07-26)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-# [3.8.0](https://github.com/3merge/q/compare/v3.7.3...v3.8.0) (2022-07-26)
+# [3.9.0](https://github.com/3merge/q/compare/v3.8.22...v3.9.0) (2022-09-01)
 
 **Note:** Version bump only for package gatsby-theme-q3
 
@@ -52,6 +12,71 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+## [3.8.22](https://github.com/3merge/q/compare/v3.8.21...v3.8.22) (2022-08-30)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [3.8.16](https://github.com/3merge/q/compare/v3.8.15...v3.8.16) (2022-08-15)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [3.8.15](https://github.com/3merge/q/compare/v3.8.14...v3.8.15) (2022-08-15)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [3.8.12](https://github.com/3merge/q/compare/v3.8.11...v3.8.12) (2022-08-02)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [3.8.9](https://github.com/3merge/q/compare/v3.8.8...v3.8.9) (2022-07-29)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [3.8.6](https://github.com/3merge/q/compare/v3.8.5...v3.8.6) (2022-07-27)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [3.8.3](https://github.com/3merge/q/compare/v3.8.2...v3.8.3) (2022-07-26)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+# [3.8.0](https://github.com/3merge/q/compare/v3.7.3...v3.8.0) (2022-07-26)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+
 ## [3.7.3](https://github.com/3merge/q/compare/v3.7.2...v3.7.3) (2022-07-22)
 
 **Note:** Version bump only for package gatsby-theme-q3

package/lib/components/PublicTemplate.js

@@ -110,9 +110,12 @@ const PublicTemplate = ({
     invertLogo,
     terms,
     privacy,
-    logo = '/logo.png',
-    photo = '/background.jpg'
-  } = (0, _useSiteMetaData.default)();
+    logo,
+    photo
+  } = (0, _useSiteMetaData.default)({
+    logo: '/logo.png',
+    photo: '/background.jpg'
+  });
   const cls = useStyle({
     photo,
     invertLogo

package/lib/components/__tests__/useSiteMetaData.test.js

@@ -0,0 +1,44 @@
+import useSiteMetaData from '../useSiteMetaData';
+
+jest.mock('gatsby', () => ({
+  graphql: jest.fn(),
+  useStaticQuery: jest.fn(),
+}));
+
+jest.mock(
+  'gatsby-theme-q3-mui/src/components/useRunTime',
+  () =>
+    jest.fn().mockReturnValue({
+      foo: 1,
+      bar: null,
+      quuz: 'string',
+      thunk: undefined,
+    }),
+);
+
+describe('useSiteMetaData', () => {
+  it('should overwrite only the nullish and undefined', () => {
+    expect(
+      useSiteMetaData({
+        foo: 2,
+        bar: 2,
+        quuz: 2,
+        thunk: 2,
+      }),
+    ).toEqual({
+      foo: 1,
+      bar: 2,
+      quuz: 'string',
+      thunk: 2,
+    });
+  });
+
+  it('should return without defaults', () => {
+    expect(useSiteMetaData()).toEqual({
+      foo: 1,
+      bar: null,
+      quuz: 'string',
+      thunk: undefined,
+    });
+  });
+});

package/lib/components/useSiteMetaData.js

@@ -13,7 +13,8 @@ var _useRunTime = _interopRequireDefault(require("gatsby-theme-q3-mui/src/compon
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _default = () => (0, _lodash.merge)((0, _lodash.get)((0, _gatsby.useStaticQuery)((0, _gatsby.graphql)`
+var _default = (defaultValues = {}) => {
+  const output = (0, _lodash.merge)((0, _lodash.get)((0, _gatsby.useStaticQuery)((0, _gatsby.graphql)`
         query {
           site {
             siteMetadata {
@@ -24,5 +25,12 @@ var _default = () => (0, _lodash.merge)((0, _lodash.get)((0, _gatsby.useStaticQu
           }
         }
       `), 'site.siteMetadata', {}), (0, _useRunTime.default)());
+  if ((0, _lodash.isObject)(output) && (0, _lodash.isObject)(defaultValues)) Object.entries(defaultValues).forEach(([key, value]) => {
+    if ((0, _lodash.isNil)(output[key])) {
+      output[key] = value;
+    }
+  });
+  return output;
+};
 
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-theme-q3",
-  "version": "3.8.15",
+  "version": "3.9.0",
   "main": "index.js",
   "license": "MIT",
   "peerDependencies": {
@@ -28,13 +28,13 @@
     "gatsby-plugin-robots-txt": "^1.6.14",
     "gatsby-plugin-sharp": "^4.2.0",
     "gatsby-plugin-sitemap": "^5.2.0",
-    "gatsby-theme-q3-mui": "^3.8.12",
+    "gatsby-theme-q3-mui": "^3.9.0",
     "gatsby-transformer-sharp": "^4.2.0",
     "lodash": "^4.17.20",
     "process": "^0.11.10",
     "prop-types": "^15.7.2",
-    "q3-ui-helpers": "^3.8.9",
-    "q3-ui-locale": "^3.8.9",
+    "q3-ui-helpers": "^3.9.0",
+    "q3-ui-locale": "^3.9.0",
     "query-string": "^7.0.1",
     "react-helmet": "^6.1.0",
     "react-share": "^4.3.1",
@@ -42,5 +42,5 @@
     "transform-loader": "^0.2.4",
     "yarn": "^1.22.17"
   },
-  "gitHead": "cb170f5776705036227768fcf146a6df23f6475b"
+  "gitHead": "16fe4b65978089e1fc14e7a1f2b8760dfb2245d9"
 }

package/src/components/PublicTemplate.jsx

@@ -98,9 +98,12 @@ const PublicTemplate = ({ children, ...rest }) => {
     invertLogo,
     terms,
     privacy,
-    logo = '/logo.png',
-    photo = '/background.jpg',
-  } = useSiteMetaData();
+    logo,
+    photo,
+  } = useSiteMetaData({
+    logo: '/logo.png',
+    photo: '/background.jpg',
+  });
 
   const cls = useStyle({
     photo,

package/src/components/__tests__/useSiteMetaData.test.js

@@ -0,0 +1,44 @@
+import useSiteMetaData from '../useSiteMetaData';
+
+jest.mock('gatsby', () => ({
+  graphql: jest.fn(),
+  useStaticQuery: jest.fn(),
+}));
+
+jest.mock(
+  'gatsby-theme-q3-mui/src/components/useRunTime',
+  () =>
+    jest.fn().mockReturnValue({
+      foo: 1,
+      bar: null,
+      quuz: 'string',
+      thunk: undefined,
+    }),
+);
+
+describe('useSiteMetaData', () => {
+  it('should overwrite only the nullish and undefined', () => {
+    expect(
+      useSiteMetaData({
+        foo: 2,
+        bar: 2,
+        quuz: 2,
+        thunk: 2,
+      }),
+    ).toEqual({
+      foo: 1,
+      bar: 2,
+      quuz: 'string',
+      thunk: 2,
+    });
+  });
+
+  it('should return without defaults', () => {
+    expect(useSiteMetaData()).toEqual({
+      foo: 1,
+      bar: null,
+      quuz: 'string',
+      thunk: undefined,
+    });
+  });
+});

package/src/components/useSiteMetaData.js

@@ -1,9 +1,9 @@
-import { get, merge } from 'lodash';
+import { get, merge, isObject, isNil } from 'lodash';
 import { useStaticQuery, graphql } from 'gatsby';
 import useRunTime from 'gatsby-theme-q3-mui/src/components/useRunTime';
 
-export default () =>
-  merge(
+export default (defaultValues = {}) => {
+  const output = merge(
     get(
       useStaticQuery(graphql`
         query {
@@ -21,3 +21,15 @@ export default () =>
     ),
     useRunTime(),
   );
+
+  if (isObject(output) && isObject(defaultValues))
+    Object.entries(defaultValues).forEach(
+      ([key, value]) => {
+        if (isNil(output[key])) {
+          output[key] = value;
+        }
+      },
+    );
+
+  return output;
+};