+ {intl.formatMessage(messages.releaseDrag)} +
+ ) : value ? ( ++ {intl.formatMessage(messages.editFile)} +
+ ) : ( ++ {intl.formatMessage(messages.fileDrag)} +
+ )} +
+
+
+ 
+`;
+
+exports[`Multilingual Logo renders a logo component in a multilingual site root 1`] = `
+
+`;
+
+exports[`Multilingual Logo renders a logo component with a custom logo in a non-root url 1`] = `
+
+`;
+
+exports[`Multilingual Logo renders a logo component with a custom logo in a non-root url with path 1`] = `
`;
diff --git a/src/components/theme/Logo/__snapshots__/Logo.test.jsx.snap b/src/components/theme/Logo/__snapshots__/Logo.test.jsx.snap
index a23f375bac..dfe8409855 100644
--- a/src/components/theme/Logo/__snapshots__/Logo.test.jsx.snap
+++ b/src/components/theme/Logo/__snapshots__/Logo.test.jsx.snap
@@ -1,20 +1,53 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`Logo renders a logo component 1`] = `
+exports[`Logo renders a logo component with a custom logo 1`] = `
+
+`;
+
+exports[`Logo renders a logo component with a custom logo in a non-root url 1`] = `
+
+
+
+`;
+
+exports[`Logo renders a logo component with default config 1`] = `
+
+`;
+
+exports[`Logo renders a logo component with default config in a non-root url 1`] = `
`;
diff --git a/src/components/theme/SearchWidget/SearchWidget.jsx b/src/components/theme/SearchWidget/SearchWidget.jsx
index b8f2008813..89db2a9a38 100644
--- a/src/components/theme/SearchWidget/SearchWidget.jsx
+++ b/src/components/theme/SearchWidget/SearchWidget.jsx
@@ -1,8 +1,11 @@
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
import { useHistory } from 'react-router-dom';
import { Form, Input } from 'semantic-ui-react';
import { defineMessages, useIntl } from 'react-intl';
+import { useDispatch, useSelector } from 'react-redux';
+import { getNavroot } from '@plone/volto/actions';
+import { hasApiExpander, getBaseUrl } from '@plone/volto/helpers';
import { Icon } from '@plone/volto/components';
import zoomSVG from '@plone/volto/icons/zoom.svg';
@@ -19,6 +22,8 @@ const messages = defineMessages({
const SearchWidget = (props) => {
const intl = useIntl();
+ const dispatch = useDispatch();
+
const [text, setText] = useState('');
const history = useHistory();
const onChangeText = (event, { value }) => {
@@ -29,14 +34,21 @@ const SearchWidget = (props) => {
const path =
pathname?.length > 0 ? `&path=${encodeURIComponent(pathname)}` : '';
- history.push(`/search?SearchableText=${encodeURIComponent(text)}${path}`);
+ history.push(`./search?SearchableText=${encodeURIComponent(text)}${path}`);
// reset input value
setText('');
event.preventDefault();
};
+ const navroot = useSelector((state) => state.navroot?.data);
+ useEffect(() => {
+ if (!hasApiExpander('navroot', getBaseUrl(pathname))) {
+ dispatch(getNavroot(getBaseUrl(pathname)));
+ }
+ }, [dispatch, pathname]);
+
return (
-