Skip to content

Commit 735af47

Browse files
sampsonjsampsonj
committed
fix drupal asset fallback injections, update zod to pick up fix
1 parent 322190a commit 735af47

File tree

19 files changed

+368
-193
lines changed

19 files changed

+368
-193
lines changed

‎lib/components/NeonFooter/NeonFooter.js‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ exports.default = void 0;
88
var _react = _interopRequireDefault(require("react"));
99
var _propTypes = _interopRequireDefault(require("prop-types"));
1010
var _htmlReactParser = _interopRequireDefault(require("html-react-parser"));
11+
var _styles = require("@material-ui/core/styles");
1112
var _Skeleton = _interopRequireDefault(require("@material-ui/lab/Skeleton"));
1213
var _remoteAssetsMap = _interopRequireDefault(require("../../remoteAssetsMap/remoteAssetsMap"));
1314
var _drupalFooter = _interopRequireDefault(require("../../remoteAssets/drupal-footer.html"));
1415
var _NeonContext = _interopRequireWildcard(require("../NeonContext/NeonContext"));
16+
var _Theme = _interopRequireDefault(require("../Theme/Theme"));
1517
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
1618
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
1719
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -22,8 +24,18 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
2224
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
2325
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
2426
var DRUPAL_FOOTER_HTML = _remoteAssetsMap.default.DRUPAL_FOOTER_HTML.KEY;
27+
var useStyles = (0, _styles.makeStyles)(function (theme) {
28+
return {
29+
footerContainer: {
30+
'& .footer-bottom__wrapper': {
31+
background: '#4B372E'
32+
}
33+
}
34+
};
35+
});
2536
var NeonFooter = function NeonFooter(props) {
2637
var drupalCssLoaded = props.drupalCssLoaded;
38+
var classes = useStyles(_Theme.default);
2739
var _NeonContext$useNeonC = _NeonContext.default.useNeonContextState(),
2840
_NeonContext$useNeonC2 = _slicedToArray(_NeonContext$useNeonC, 1),
2941
_NeonContext$useNeonC3 = _NeonContext$useNeonC2[0],
@@ -60,7 +72,8 @@ var NeonFooter = function NeonFooter(props) {
6072
case 'drupal-fallback':
6173
default:
6274
return /*#__PURE__*/_react.default.createElement("footer", {
63-
id: "footer"
75+
id: "footer",
76+
className: classes.footerContainer
6477
}, (0, _htmlReactParser.default)(_drupalFooter.default));
6578
}
6679
};

‎lib/components/NeonHeader/NeonHeader.js‎

Lines changed: 50 additions & 10 deletions
Large diffs are not rendered by default.

‎lib/components/NeonPage/NeonPage.js‎

Lines changed: 25 additions & 9 deletions
Large diffs are not rendered by default.

‎lib/images/svg/header-search.svg‎

Lines changed: 5 additions & 0 deletions
Loading

‎lib/remoteAssets/drupal-header.html.d.ts‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎lib/remoteAssets/drupal-header.html.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/remoteAssets/drupal-theme.css‎

Lines changed: 58 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -788,11 +788,13 @@
788788
#header input[type="password"]:not(.MuiInputBase-input),
789789
#header input[type="date"]:not(.MuiInputBase-input),
790790
#header input[type="email"]:not(.MuiInputBase-input),
791-
#header input[type="number"]:not(.MuiInputBase-input), #footer input[type="text"]:not(.MuiInputBase-input),
791+
#header input[type="number"]:not(.MuiInputBase-input),
792+
#header input[type="time"]:not(.MuiInputBase-input), #footer input[type="text"]:not(.MuiInputBase-input),
792793
#footer input[type="password"]:not(.MuiInputBase-input),
793794
#footer input[type="date"]:not(.MuiInputBase-input),
794795
#footer input[type="email"]:not(.MuiInputBase-input),
795-
#footer input[type="number"]:not(.MuiInputBase-input) {
796+
#footer input[type="number"]:not(.MuiInputBase-input),
797+
#footer input[type="time"]:not(.MuiInputBase-input) {
796798
height: 3rem;
797799
background: #fff;
798800
border: 1px solid #D7D9D9;
@@ -808,21 +810,25 @@
808810
#header input[type="password"]:not(.MuiInputBase-input),
809811
#header input[type="date"]:not(.MuiInputBase-input),
810812
#header input[type="email"]:not(.MuiInputBase-input),
811-
#header input[type="number"]:not(.MuiInputBase-input), #footer input[type="text"]:not(.MuiInputBase-input),
813+
#header input[type="number"]:not(.MuiInputBase-input),
814+
#header input[type="time"]:not(.MuiInputBase-input), #footer input[type="text"]:not(.MuiInputBase-input),
812815
#footer input[type="password"]:not(.MuiInputBase-input),
813816
#footer input[type="date"]:not(.MuiInputBase-input),
814817
#footer input[type="email"]:not(.MuiInputBase-input),
815-
#footer input[type="number"]:not(.MuiInputBase-input) {
818+
#footer input[type="number"]:not(.MuiInputBase-input),
819+
#footer input[type="time"]:not(.MuiInputBase-input) {
816820
font-size: 1rem; } }
817821
#header input[type="text"]:not(.MuiInputBase-input):hover,
818822
#header input[type="password"]:not(.MuiInputBase-input):hover,
819823
#header input[type="date"]:not(.MuiInputBase-input):hover,
820824
#header input[type="email"]:not(.MuiInputBase-input):hover,
821-
#header input[type="number"]:not(.MuiInputBase-input):hover, #footer input[type="text"]:not(.MuiInputBase-input):hover,
825+
#header input[type="number"]:not(.MuiInputBase-input):hover,
826+
#header input[type="time"]:not(.MuiInputBase-input):hover, #footer input[type="text"]:not(.MuiInputBase-input):hover,
822827
#footer input[type="password"]:not(.MuiInputBase-input):hover,
823828
#footer input[type="date"]:not(.MuiInputBase-input):hover,
824829
#footer input[type="email"]:not(.MuiInputBase-input):hover,
825-
#footer input[type="number"]:not(.MuiInputBase-input):hover {
830+
#footer input[type="number"]:not(.MuiInputBase-input):hover,
831+
#footer input[type="time"]:not(.MuiInputBase-input):hover {
826832
box-shadow: none;
827833
transition: all 0.25s;
828834
border: 1px solid #0073CF !important; }
@@ -834,15 +840,19 @@
834840
#header input[type="email"]:not(.MuiInputBase-input):active,
835841
#header input[type="email"]:not(.MuiInputBase-input):focus,
836842
#header input[type="number"]:not(.MuiInputBase-input):active,
837-
#header input[type="number"]:not(.MuiInputBase-input):focus, #footer input[type="text"]:not(.MuiInputBase-input):active, #footer input[type="text"]:not(.MuiInputBase-input):focus,
843+
#header input[type="number"]:not(.MuiInputBase-input):focus,
844+
#header input[type="time"]:not(.MuiInputBase-input):active,
845+
#header input[type="time"]:not(.MuiInputBase-input):focus, #footer input[type="text"]:not(.MuiInputBase-input):active, #footer input[type="text"]:not(.MuiInputBase-input):focus,
838846
#footer input[type="password"]:not(.MuiInputBase-input):active,
839847
#footer input[type="password"]:not(.MuiInputBase-input):focus,
840848
#footer input[type="date"]:not(.MuiInputBase-input):active,
841849
#footer input[type="date"]:not(.MuiInputBase-input):focus,
842850
#footer input[type="email"]:not(.MuiInputBase-input):active,
843851
#footer input[type="email"]:not(.MuiInputBase-input):focus,
844852
#footer input[type="number"]:not(.MuiInputBase-input):active,
845-
#footer input[type="number"]:not(.MuiInputBase-input):focus {
853+
#footer input[type="number"]:not(.MuiInputBase-input):focus,
854+
#footer input[type="time"]:not(.MuiInputBase-input):active,
855+
#footer input[type="time"]:not(.MuiInputBase-input):focus {
846856
transition: all 0.25s;
847857
border: 1px solid #0073CF !important;
848858
box-shadow: 0px 0px 0px 4px #C4C4C4;
@@ -851,16 +861,21 @@
851861
#header input[type="password"]:not(.MuiInputBase-input):disabled,
852862
#header input[type="date"]:not(.MuiInputBase-input):disabled,
853863
#header input[type="email"]:not(.MuiInputBase-input):disabled,
854-
#header input[type="number"]:not(.MuiInputBase-input):disabled, #footer input[type="text"]:not(.MuiInputBase-input):disabled,
864+
#header input[type="number"]:not(.MuiInputBase-input):disabled,
865+
#header input[type="time"]:not(.MuiInputBase-input):disabled, #footer input[type="text"]:not(.MuiInputBase-input):disabled,
855866
#footer input[type="password"]:not(.MuiInputBase-input):disabled,
856867
#footer input[type="date"]:not(.MuiInputBase-input):disabled,
857868
#footer input[type="email"]:not(.MuiInputBase-input):disabled,
858-
#footer input[type="number"]:not(.MuiInputBase-input):disabled {
869+
#footer input[type="number"]:not(.MuiInputBase-input):disabled,
870+
#footer input[type="time"]:not(.MuiInputBase-input):disabled {
859871
color: #A2A4A3;
860872
background: #F5F6F7;
861873
border: 1px solid #D7D9D9;
862874
box-sizing: border-box;
863875
box-shadow: inset 0px 1px 0px #7C7F80; }
876+
#header .time-start, #footer .time-start {
877+
display: -ms-flexbox;
878+
display: flex; }
864879
#header textarea, #footer textarea {
865880
background: #fff;
866881
border: 1px solid #D7D9D9;
@@ -1376,24 +1391,23 @@
13761391
#header form:not(.layout-paragraphs-component-form) input[type="radio"]:not(.rlglc-input) + label:hover:before, #footer form:not(.layout-paragraphs-component-form) input[type="radio"]:not(.rlglc-input) + label:hover:before {
13771392
border: 1px solid #0073CF !important; }
13781393
#header .form-no-label .visually-hidden, #footer .form-no-label .visually-hidden {
1379-
clip: initial;
13801394
overflow: initial;
13811395
text-indent: -10000px;
13821396
height: auto;
13831397
width: auto; }
1384-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked), #header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked), #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked {
1398+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked), #header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked), #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked {
13851399
position: absolute;
13861400
left: -9999px; }
1387-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label,
1388-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label,
1389-
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label {
1401+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label,
1402+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label,
1403+
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label {
13901404
position: relative;
13911405
padding-left: 1.95em;
13921406
cursor: pointer;
13931407
z-index: 1; }
1394-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label:before,
1395-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label:before,
1396-
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label:before {
1408+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label:before,
1409+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label:before,
1410+
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label:before {
13971411
content: '';
13981412
position: absolute;
13991413
left: 0;
@@ -1403,9 +1417,9 @@
14031417
border: 1px solid #D7D9D9;
14041418
background: #fff;
14051419
border-radius: 2px; }
1406-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label:after,
1407-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label:after, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label:after,
1408-
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label:after {
1420+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label:after,
1421+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label:after, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label:after,
1422+
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label:after {
14091423
content: '';
14101424
background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2211%22%20height%3D%228%22%20viewBox%3D%220%200%2011%208%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%204l3%203%206-6%22%20stroke%3D%22%23000%22%20stroke-width%3D%222%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%2F%3E%3C%2Fsvg%3E");
14111425
background-position: center center;
@@ -1416,24 +1430,24 @@
14161430
width: 11px;
14171431
display: block;
14181432
position: absolute; }
1419-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label:after, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked) + label:after {
1433+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label:after, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked) + label:after {
14201434
opacity: 0;
14211435
transform: scale(0); }
1422-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label:after, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked + label:after {
1436+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label:after, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked + label:after {
14231437
opacity: 1;
14241438
transform: scale(1); }
1425-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):disabled:not(:checked) + label:before,
1426-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):disabled:checked + label:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):disabled:not(:checked) + label:before,
1427-
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):disabled:checked + label:before {
1439+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):disabled:not(:checked) + label:before,
1440+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):disabled:checked + label:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):disabled:not(:checked) + label:before,
1441+
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):disabled:checked + label:before {
14281442
box-shadow: none;
14291443
border-color: #D7D9D9;
14301444
background-color: #fff; }
1431-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked:focus + label:before,
1432-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked):focus + label:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):checked:focus + label:before,
1433-
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(:checked):focus + label:before {
1445+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked:focus + label:before,
1446+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked):focus + label:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):checked:focus + label:before,
1447+
#footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday):not(:checked):focus + label:before {
14341448
box-shadow: 0px 0px 0px 4px #C4C4C4;
14351449
border: 1px solid #0073CF; }
1436-
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input) + label:hover:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input) + label:hover:before {
1450+
#header input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday) + label:hover:before, #footer input[type="checkbox"]:not(.nav-trigger):not(.rlglc-input):not(.allday) + label:hover:before {
14371451
border: 1px solid #0073CF !important; }
14381452
#header .webform-element-description, #footer .webform-element-description {
14391453
font-size: 0.875rem;
@@ -1443,6 +1457,20 @@
14431457
font-size: 0.9375rem; } }
14441458
#header #linkit-editor-dialog-form, #footer #linkit-editor-dialog-form {
14451459
min-height: 400px; }
1460+
#header .smartdate--time-inline, #footer .smartdate--time-inline {
1461+
display: -ms-flexbox;
1462+
display: flex;
1463+
grid-column-gap: 0.5em;
1464+
-ms-flex-direction: row;
1465+
flex-direction: row;
1466+
-ms-flex-wrap: nowrap;
1467+
flex-wrap: nowrap;
1468+
-ms-flex-line-pack: center;
1469+
align-content: center;
1470+
-ms-flex-align: baseline;
1471+
align-items: baseline;
1472+
-ms-flex-pack: start;
1473+
justify-content: flex-start; }
14461474
#header .table-wrapper, #footer .table-wrapper {
14471475
display: -ms-grid;
14481476
display: grid;

‎package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"tinycolor2": "^1.4.2",
6262
"ua-parser-js": "^1.0.32",
6363
"universal-cookie": "^4.0.4",
64-
"zod": "^3.20.0"
64+
"zod": "^3.20.2"
6565
},
6666
"peerDependencies": {
6767
"worker-loader": "^3.0.8"

0 commit comments

Comments
 (0)