@comet/cms-admin 8.24.5 → 8.25.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/blocks/ExternalLinkBlock.d.ts.map +1 -1
- package/lib/blocks/ExternalLinkBlock.js +18 -4
- package/lib/blocks.generated.d.ts +2 -0
- package/lib/blocks.generated.d.ts.map +1 -1
- package/lib/pages/pageSearch/usePageSearch.d.ts.map +1 -1
- package/lib/pages/pageSearch/usePageSearch.js +22 -3
- package/package.json +8 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalLinkBlock.d.ts","sourceRoot":"","sources":["../../src/blocks/ExternalLinkBlock.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAM9F,OAAO,EAAiB,KAAK,cAAc,EAAE,KAAK,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAEtF,KAAK,KAAK,GAAG,qBAAqB,CAAC;AAEnC,eAAO,MAAM,iBAAiB,EAAE,cAAc,CAAC,qBAAqB,EAAE,KAAK,EAAE,sBAAsB,CAAC,GAAG,kBAAkB,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"ExternalLinkBlock.d.ts","sourceRoot":"","sources":["../../src/blocks/ExternalLinkBlock.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAM9F,OAAO,EAAiB,KAAK,cAAc,EAAE,KAAK,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAEtF,KAAK,KAAK,GAAG,qBAAqB,CAAC;AAEnC,eAAO,MAAM,iBAAiB,EAAE,cAAc,CAAC,qBAAqB,EAAE,KAAK,EAAE,sBAAsB,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAuF9H,CAAC"}
|
|
@@ -32,7 +32,8 @@ var ExternalLinkBlock = exports.ExternalLinkBlock = _objectSpread(_objectSpread(
|
|
|
32
32
|
defaultValues: function defaultValues() {
|
|
33
33
|
return {
|
|
34
34
|
targetUrl: undefined,
|
|
35
|
-
openInNewWindow: false
|
|
35
|
+
openInNewWindow: false,
|
|
36
|
+
noFollow: false
|
|
36
37
|
};
|
|
37
38
|
},
|
|
38
39
|
category: _types.BlockCategory.Navigation,
|
|
@@ -42,7 +43,8 @@ var ExternalLinkBlock = exports.ExternalLinkBlock = _objectSpread(_objectSpread(
|
|
|
42
43
|
state2Output: function state2Output(state) {
|
|
43
44
|
return {
|
|
44
45
|
targetUrl: state.targetUrl,
|
|
45
|
-
openInNewWindow: state.openInNewWindow
|
|
46
|
+
openInNewWindow: state.openInNewWindow,
|
|
47
|
+
noFollow: state.noFollow
|
|
46
48
|
};
|
|
47
49
|
},
|
|
48
50
|
output2State: function () {
|
|
@@ -52,7 +54,8 @@ var ExternalLinkBlock = exports.ExternalLinkBlock = _objectSpread(_objectSpread(
|
|
|
52
54
|
case 0:
|
|
53
55
|
return _context.a(2, {
|
|
54
56
|
targetUrl: output.targetUrl,
|
|
55
|
-
openInNewWindow: output.openInNewWindow
|
|
57
|
+
openInNewWindow: output.openInNewWindow,
|
|
58
|
+
noFollow: output.noFollow
|
|
56
59
|
});
|
|
57
60
|
}
|
|
58
61
|
}, _callee);
|
|
@@ -69,7 +72,8 @@ var ExternalLinkBlock = exports.ExternalLinkBlock = _objectSpread(_objectSpread(
|
|
|
69
72
|
if ((0, _isLinkTarget.isLinkTarget)(url)) {
|
|
70
73
|
return {
|
|
71
74
|
targetUrl: url,
|
|
72
|
-
openInNewWindow: false
|
|
75
|
+
openInNewWindow: false,
|
|
76
|
+
noFollow: false
|
|
73
77
|
};
|
|
74
78
|
}
|
|
75
79
|
return false;
|
|
@@ -101,6 +105,16 @@ var ExternalLinkBlock = exports.ExternalLinkBlock = _objectSpread(_objectSpread(
|
|
|
101
105
|
defaultMessage: "Open in new window"
|
|
102
106
|
}),
|
|
103
107
|
name: "openInNewWindow"
|
|
108
|
+
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_admin.CheckboxField, {
|
|
109
|
+
label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
|
|
110
|
+
id: "comet.blocks.link.external.noFollow",
|
|
111
|
+
defaultMessage: "No follow"
|
|
112
|
+
}),
|
|
113
|
+
name: "noFollow",
|
|
114
|
+
helperText: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
|
|
115
|
+
id: "comet.blocks.link.external.noFollow.helperText",
|
|
116
|
+
defaultMessage: "Adds rel=\"nofollow\" to the link, telling search engines not to follow it. Use for sponsored, paid, user-generated or untrusted links so that no SEO authority is passed to the target."
|
|
117
|
+
})
|
|
104
118
|
})]
|
|
105
119
|
})
|
|
106
120
|
});
|
|
@@ -54,6 +54,7 @@ export interface EmailLinkBlockData {
|
|
|
54
54
|
export interface ExternalLinkBlockData {
|
|
55
55
|
targetUrl?: string;
|
|
56
56
|
openInNewWindow: boolean;
|
|
57
|
+
noFollow?: boolean;
|
|
57
58
|
}
|
|
58
59
|
export interface InternalLinkBlockData {
|
|
59
60
|
targetPageAnchor?: string;
|
|
@@ -216,6 +217,7 @@ export interface EmailLinkBlockInput {
|
|
|
216
217
|
export interface ExternalLinkBlockInput {
|
|
217
218
|
targetUrl?: string;
|
|
218
219
|
openInNewWindow: boolean;
|
|
220
|
+
noFollow?: boolean;
|
|
219
221
|
}
|
|
220
222
|
export interface InternalLinkBlockInput {
|
|
221
223
|
targetPageId?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocks.generated.d.ts","sourceRoot":"","sources":["../src/blocks.generated.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,WAAW,4BAA4B;IACzC,IAAI,CAAC,EAAE;QACH,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,YAAY,EAAE,QAAQ,GAAG,UAAU,CAAC;CACvC;AACD,MAAM,WAAW,iBAAiB;IAC9B,cAAc,EAAE,KAAK,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,mBAAmB,GAAG,iBAAiB,CAAC;KAClD,CAAC,CAAC;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,mBAAmB,GAAG,iBAAiB,CAAC;KAClD,CAAC;CACL;AACD,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,mBAAmB,CAAC;IAClC,OAAO,CAAC,EAAE;QACN,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,OAAO,CAAC;QAClB,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,KAAK,CAAC;YACb,EAAE,EAAE,MAAM,CAAC;YACX,QAAQ,EAAE,MAAM,CAAC;YACjB,OAAO,EAAE,MAAM,CAAC;SACnB,CAAC,CAAC;KACN,CAAC;CACL;AACD,MAAM,WAAW,kBAAkB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,qBAAqB;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"blocks.generated.d.ts","sourceRoot":"","sources":["../src/blocks.generated.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePageSearch.d.ts","sourceRoot":"","sources":["../../../src/pages/pageSearch/usePageSearch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,cAAc,
|
|
1
|
+
{"version":3,"file":"usePageSearch.d.ts","sourceRoot":"","sources":["../../../src/pages/pageSearch/usePageSearch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,cAAc,EAAqD,MAAM,OAAO,CAAC;AAE9G,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEvE,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG;IAAE,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAElH,eAAO,MAAM,kBAAkB,uCAM9B,CAAC;AAEF,MAAM,WAAW,aAAa;IAC1B,wBAAwB,EAAE,YAAY,EAAE,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;CACpC;AAED,UAAU,oBAAoB;IAC1B,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAC3C,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACnD,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;CACzE;AAED,QAAA,MAAM,aAAa,GAAI,wEAAwE,oBAAoB,KAAG,aA+KrH,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}
|
|
@@ -45,6 +45,10 @@ var usePageSearch = exports.usePageSearch = function usePageSearch(_ref) {
|
|
|
45
45
|
_useState6 = _slicedToArray(_useState5, 2),
|
|
46
46
|
query = _useState6[0],
|
|
47
47
|
setQuery = _useState6[1];
|
|
48
|
+
|
|
49
|
+
// Page id of a match that should be scrolled to once its tree row is rendered. Scrolling has to be deferred
|
|
50
|
+
// because navigating to a match may first need to re-expand collapsed ancestors (e.g. after "Collapse all").
|
|
51
|
+
var pageIdToScrollTo = (0, _react.useRef)(null);
|
|
48
52
|
var domainHost;
|
|
49
53
|
try {
|
|
50
54
|
domainHost = new URL(siteUrl).host;
|
|
@@ -167,6 +171,18 @@ var usePageSearch = exports.usePageSearch = function usePageSearch(_ref) {
|
|
|
167
171
|
});
|
|
168
172
|
});
|
|
169
173
|
}, [matches, pagesToRender]);
|
|
174
|
+
(0, _react.useEffect)(function () {
|
|
175
|
+
var pageId = pageIdToScrollTo.current;
|
|
176
|
+
if (pageId === null) {
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
179
|
+
if (pagesToRenderWithMatches.some(function (page) {
|
|
180
|
+
return page.id === pageId;
|
|
181
|
+
})) {
|
|
182
|
+
onUpdateCurrentMatch(pageId, pagesToRenderWithMatches);
|
|
183
|
+
pageIdToScrollTo.current = null;
|
|
184
|
+
}
|
|
185
|
+
}, [pagesToRenderWithMatches, currentMatchIndex, onUpdateCurrentMatch]);
|
|
170
186
|
var pageSearchPartialApi = (0, _react.useMemo)(function () {
|
|
171
187
|
if (matches === null || currentMatchIndex === null) {
|
|
172
188
|
return {};
|
|
@@ -184,14 +200,17 @@ var usePageSearch = exports.usePageSearch = function usePageSearch(_ref) {
|
|
|
184
200
|
updateCurrentMatch(currentMatchIndex === 0 ? matches.length - 1 : currentMatchIndex - 1);
|
|
185
201
|
};
|
|
186
202
|
var updateCurrentMatch = function updateCurrentMatch(nextCurrentMatchIndex) {
|
|
203
|
+
var nextMatch = matches[nextCurrentMatchIndex];
|
|
187
204
|
setMatches(matches.map(function (match, index) {
|
|
188
205
|
return _objectSpread(_objectSpread({}, match), {}, {
|
|
189
206
|
focused: index === nextCurrentMatchIndex
|
|
190
207
|
});
|
|
191
208
|
}));
|
|
192
209
|
setCurrentMatchIndex(nextCurrentMatchIndex);
|
|
193
|
-
|
|
194
|
-
|
|
210
|
+
// Re-expand the match's ancestors in case they were collapsed (e.g. via "Collapse all"), then scroll to it
|
|
211
|
+
// once the row is rendered.
|
|
212
|
+
expandTreeForMatches([nextMatch]);
|
|
213
|
+
pageIdToScrollTo.current = nextMatch.page.id;
|
|
195
214
|
};
|
|
196
215
|
return {
|
|
197
216
|
currentMatch: currentMatchIndex,
|
|
@@ -199,7 +218,7 @@ var usePageSearch = exports.usePageSearch = function usePageSearch(_ref) {
|
|
|
199
218
|
jumpToNextMatch: jumpToNextMatch,
|
|
200
219
|
jumpToPreviousMatch: jumpToPreviousMatch
|
|
201
220
|
};
|
|
202
|
-
}, [matches, currentMatchIndex,
|
|
221
|
+
}, [matches, currentMatchIndex, expandTreeForMatches]);
|
|
203
222
|
return _objectSpread({
|
|
204
223
|
query: query,
|
|
205
224
|
setQuery: setQuery,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@comet/cms-admin",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.25.1",
|
|
4
4
|
"description": "Comet CMS Admin package",
|
|
5
5
|
"repository": {
|
|
6
6
|
"directory": "packages/admin/cms-admin",
|
|
@@ -42,10 +42,10 @@
|
|
|
42
42
|
"use-debounce": "^10.0.6",
|
|
43
43
|
"uuid": "^11.1.0",
|
|
44
44
|
"zod": "^3.23.8",
|
|
45
|
-
"@comet/admin": "8.
|
|
46
|
-
"@comet/admin-date-time": "8.
|
|
47
|
-
"@comet/admin-icons": "8.
|
|
48
|
-
"@comet/admin-rte": "8.
|
|
45
|
+
"@comet/admin": "8.25.1",
|
|
46
|
+
"@comet/admin-date-time": "8.25.1",
|
|
47
|
+
"@comet/admin-icons": "8.25.1",
|
|
48
|
+
"@comet/admin-rte": "8.25.1"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@apollo/client": "^3.14.0",
|
|
@@ -100,9 +100,9 @@
|
|
|
100
100
|
"typescript": "5.9.3",
|
|
101
101
|
"vite-tsconfig-paths": "^6.0.3",
|
|
102
102
|
"vitest": "^4.0.16",
|
|
103
|
-
"@comet/admin-babel-preset": "8.
|
|
104
|
-
"@comet/cli": "8.
|
|
105
|
-
"@comet/eslint-config": "8.
|
|
103
|
+
"@comet/admin-babel-preset": "8.25.1",
|
|
104
|
+
"@comet/cli": "8.25.1",
|
|
105
|
+
"@comet/eslint-config": "8.25.1"
|
|
106
106
|
},
|
|
107
107
|
"peerDependencies": {
|
|
108
108
|
"@apollo/client": "^3.7.0",
|