@plone/volto 17.4.0 → 17.6.0

package/src/components/theme/Sitemap/Sitemap.jsx

@@ -1,15 +1,10 @@
-/**
- * Login container.
- * @module components/theme/Sitemap/Sitemap
- */
-
-import React, { Component } from 'react';
+import { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { asyncConnect } from '@plone/volto/helpers';
 import { defineMessages, injectIntl } from 'react-intl';
-import { Container } from 'semantic-ui-react';
+import { Container as SemanticContainer } from 'semantic-ui-react';
 import { Helmet, toBackendLang } from '@plone/volto/helpers';
 import { Link } from 'react-router-dom';
 import config from '@plone/volto/registry';
@@ -30,38 +25,26 @@ export function getSitemapPath(pathname = '', lang) {
 }
 
 /**
- * Sitemap class.
- * @class Sitemap
- * @extends Component
+ * Sitemap function component.
+ * @function Sitemap
+ * @param {Object} props - Component properties.
+ * @returns {JSX.Element} - Rendered component.
  */
-class Sitemap extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    getNavigation: PropTypes.func.isRequired,
-  };
+function Sitemap(props) {
+  const {
+    location: { pathname },
+    language,
+    getNavigation,
+  } = props;
 
-  componentDidMount() {
+  useEffect(() => {
     const { settings } = config;
+    const lang = settings.isMultilingual ? `${toBackendLang(language)}` : null;
+    const path = getSitemapPath(pathname, lang);
+    getNavigation(path, 4);
+  }, [pathname, language, getNavigation]);
 
-    const lang = settings.isMultilingual
-      ? `${toBackendLang(this.props.lang)}`
-      : null;
-
-    const path = getSitemapPath(this.props.location.pathname, lang);
-    this.props.getNavigation(path, 4);
-  }
-
-  /**
-   * Render method.
-   * @method render
-   * @returns {string} Markup for the component.
-   */
-
-  renderItems = (items) => {
+  const renderItems = (items) => {
     return (
       <ul>
         {items.map((item) => (
@@ -70,26 +53,35 @@ class Sitemap extends Component {
             className={item.items?.length > 0 ? 'with-children' : ''}
           >
             <Link to={item.url}>{item.title}</Link>
-            {item.items && this.renderItems(item.items)}
+            {item.items && renderItems(item.items)}
           </li>
         ))}
       </ul>
     );
   };
-  render() {
-    const { items } = this.props;
-    return (
-      <div id="page-sitemap">
-        <Helmet title={this.props.intl.formatMessage(messages.Sitemap)} />
-        <Container className="view-wrapper">
-          <h1>{this.props.intl.formatMessage(messages.Sitemap)} </h1>
-          {items && this.renderItems(items)}
-        </Container>
-      </div>
-    );
-  }
+
+  const Container =
+    config.getComponent({ name: 'Container' }).component || SemanticContainer;
+
+  return (
+    <div id="page-sitemap">
+      <Helmet title={props.intl.formatMessage(messages.Sitemap)} />
+      <Container className="view-wrapper">
+        <h1>{props.intl.formatMessage(messages.Sitemap)} </h1>
+        {props.items && renderItems(props.items)}
+      </Container>
+    </div>
+  );
 }
 
+Sitemap.propTypes = {
+  getNavigation: PropTypes.func.isRequired,
+  location: PropTypes.object.isRequired,
+  intl: PropTypes.object.isRequired,
+  lang: PropTypes.string.isRequired,
+  items: PropTypes.array.isRequired,
+};
+
 export const __test__ = compose(
   injectIntl,
   connect(
@@ -116,14 +108,12 @@ export default compose(
       promise: ({ location, store: { dispatch, getState } }) => {
         if (!__SERVER__) return;
         const { settings } = config;
-
         const path = getSitemapPath(
           location.pathname,
           settings.isMultilingual
             ? toBackendLang(getState().intl.locale)
             : null,
         );
-
         return dispatch(getNavigation(path, 4));
       },
     },

package/src/helpers/Api/APIResourceWithAuth.js

@@ -27,7 +27,7 @@ export const getAPIResourceWithAuth = (req) =>
       apiPath = settings.apiPath;
     }
     const request = superagent
-      .get(`${apiPath}${APISUFIX}${req.path}`)
+      .get(`${apiPath}${__DEVELOPMENT__ ? '' : APISUFIX}${req.path}`)
       .maxResponseSize(settings.maxResponseSize)
       .responseType('blob');
     const authToken = req.universalCookies.get('auth_token');

package/theme/themes/pastanaga/elements/input.overrides

@@ -95,8 +95,19 @@ of an error is present, it overrides a default from SemanticUI grid definitions.
     cursor: pointer;
     text-align: initial;
 
-    &:focus {
-      outline: none;
+    &.clear-search-button {
+      //needed for focus
+      margin-left: 0.1em;
+      svg.icon {
+        margin: auto;
+      }
+      &:focus,
+      &:hover {
+        -webkit-box-shadow: none;
+        box-shadow: none;
+        color: @pink !important;
+        outline: 1px solid @pink;
+      }
     }
   }
 }

package/theme/themes/pastanaga/elements/input.variables

@@ -9,7 +9,6 @@
 // Pastanaga variable
 @inputFontWeight: 300;
 
-
 /*-------------------
         Types
 --------------------*/
@@ -20,7 +19,6 @@
 
 /* Labeled Input */
 
-
 /*-------------------
         States
 --------------------*/
@@ -35,7 +33,6 @@
 
 /* Loader */
 
-
 /*-------------------
       Variations
 --------------------*/

package/theme/themes/pastanaga/extras/blocks.less

@@ -42,6 +42,15 @@
   border-color: rgba(120, 192, 215, 0.75);
 }
 
+.block-editor-title,
+.block-editor-slate,
+.block-editor-slateTable,
+.slate-editor.selected {
+  :focus-visible {
+    outline: none;
+  }
+}
+
 .block .block:hover::before {
   border-color: rgba(120, 192, 215, 0.375);
 }
@@ -522,14 +531,6 @@ body.has-toolbar.has-sidebar-collapsed .ui.wrapper > .ui.inner.block.full {
   }
 }
 
-.block .clear-search-button {
-  &:hover,
-  &:focus {
-    -webkit-box-shadow: none;
-    box-shadow: none;
-    color: #e40166 !important;
-  }
-}
 // .ui.basic.button.block-delete-button {
 //   top: 22px;
 //   right: 0;
@@ -783,6 +784,14 @@ body.has-toolbar.has-sidebar-collapsed .ui.wrapper > .ui.inner.block.full {
     // reseting the default Accordion behavior
     display: initial;
   }
+  .ui.form .ui.input input {
+    //reset for semantic-ui outline:none
+    border-width: @1px;
+    border-color: transparent;
+    &:focus {
+      border-color: @focusedFormBorderColor;
+    }
+  }
 }
 
 .accordion-tools {

package/theme/themes/pastanaga/extras/contents.less

@@ -193,7 +193,7 @@
     word-break: break-all;
   }
 
-  .broken-links-list-link-wrapper {
+  .broken-links-list {
     margin-top: 30px;
   }
 }