Merge branch 'main' of https://github.com/decaporg/decap-cms into dec…

…aporg-main
olegfedak · Jul 4, 2024 · b602e7a · b602e7a
2 parents a29350e + 232b012
commit b602e7a
Show file tree

Hide file tree

Showing 20 changed files with 87 additions and 43 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/decap-cms-app/CHANGELOG.md b/packages/decap-cms-app/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.11](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.1.10...decap-cms-app@3.1.11) (2024-06-27)
+
+**Note:** Version bump only for package decap-cms-app
+
 ## [3.1.10](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.1.9...decap-cms-app@3.1.10) (2024-04-16)
 
 **Note:** Version bump only for package decap-cms-app

diff --git a/packages/decap-cms-app/README.md b/packages/decap-cms-app/README.md
@@ -17,8 +17,8 @@ Install via script tag:
 <!-- Excluding `doctype` and `head` but you should add them -->
 <body>
   <!-- Add these scripts to the bottom of the body -->
-  <script src="https://unpkg.com/react@^16/umd/react.production.min.js"></script>
-  <script src="https://unpkg.com/react-dom@^16/umd/react-dom.production.min.js"></script>
+  <script src="https://unpkg.com/react@^18/umd/react.production.min.js"></script>
+  <script src="https://unpkg.com/react-dom@^18/umd/react-dom.production.min.js"></script>
   <script src="https://unpkg.com/decap-cms-app/dist/decap-cms-app.js"></script>
 
   <!-- Initialize the CMS -->

diff --git a/packages/decap-cms-app/package.json b/packages/decap-cms-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-app",
   "description": "An extensible, open source, Git-based, React CMS for static sites. Reusable congiuration with React as peer.",
-  "version": "3.1.10",
+  "version": "3.1.11",
   "homepage": "https://www.decapcms.org",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-app",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
@@ -36,23 +36,23 @@
     "decap-cms-backend-git-gateway": "^3.1.1",
     "decap-cms-backend-github": "^3.1.2",
     "decap-cms-backend-gitlab": "^3.1.3",
-    "decap-cms-backend-proxy": "^3.1.1",
+    "decap-cms-backend-proxy": "^3.1.2",
     "decap-cms-backend-test": "^3.1.1",
-    "decap-cms-core": "^3.3.6",
+    "decap-cms-core": "^3.3.7",
     "decap-cms-editor-component-image": "^3.1.1",
     "decap-cms-lib-auth": "^3.0.5",
     "decap-cms-lib-util": "^3.0.4",
     "decap-cms-lib-widgets": "^3.0.2",
     "decap-cms-locales": "^3.1.4",
-    "decap-cms-ui-default": "^3.1.1",
+    "decap-cms-ui-default": "^3.1.2",
     "decap-cms-widget-boolean": "^3.1.1",
     "decap-cms-widget-code": "^3.1.2",
     "decap-cms-widget-colorstring": "^3.1.1",
     "decap-cms-widget-datetime": "^3.1.5",
     "decap-cms-widget-file": "^3.1.1",
     "decap-cms-widget-image": "^3.1.1",
     "decap-cms-widget-list": "^3.1.1",
-    "decap-cms-widget-map": "^3.1.1",
+    "decap-cms-widget-map": "^3.1.2",
     "decap-cms-widget-markdown": "^3.1.3",
     "decap-cms-widget-number": "^3.1.1",
     "decap-cms-widget-object": "^3.1.2",

diff --git a/packages/decap-cms-backend-proxy/CHANGELOG.md b/packages/decap-cms-backend-proxy/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.2](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-proxy@3.1.1...decap-cms-backend-proxy@3.1.2) (2024-06-27)
+
+### Bug Fixes
+
+- display custom logo when using a proxy server ([#7235](https://github.com/decaporg/decap-cms/issues/7235)) ([7feca52](https://github.com/decaporg/decap-cms/commit/7feca52605315a764dfbe1b65c6782a644191dd4))
+
 ## [3.1.1](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-proxy@3.1.0-beta.1...decap-cms-backend-proxy@3.1.1) (2024-03-21)
 
 **Note:** Version bump only for package decap-cms-backend-proxy

diff --git a/packages/decap-cms-backend-proxy/package.json b/packages/decap-cms-backend-proxy/package.json
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-backend-proxy",
   "description": "Proxy backend for Decap CMS",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-backend-proxy",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
   "license": "MIT",

diff --git a/packages/decap-cms-backend-proxy/src/AuthenticationPage.js b/packages/decap-cms-backend-proxy/src/AuthenticationPage.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
-import { Icon, buttons, GoBackButton } from 'decap-cms-ui-default';
+import { Icon, buttons, GoBackButton, renderPageLogo } from 'decap-cms-ui-default';
 
 const StyledAuthenticationPage = styled.section`
   display: flex;
@@ -12,11 +12,6 @@ const StyledAuthenticationPage = styled.section`
   padding: 20px;
 `;
 
-const PageLogoIcon = styled(Icon)`
-  color: #c4c6d2;
-  margin-top: -300px;
-`;
-
 const LoginButton = styled.button`
   ${buttons.button};
   ${buttons.default};
@@ -51,7 +46,7 @@ export default class AuthenticationPage extends React.Component {
 
     return (
       <StyledAuthenticationPage>
-        <PageLogoIcon size="300px" type="decap-cms" />
+        {renderPageLogo(config.logo_url)}
         <LoginButton disabled={inProgress} onClick={this.handleLogin}>
           {inProgress ? t('auth.loggingIn') : t('auth.login')}
         </LoginButton>

diff --git a/packages/decap-cms-core/CHANGELOG.md b/packages/decap-cms-core/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.3.7](https://github.com/decaporg/decap-cms/compare/decap-cms-core@3.3.6...decap-cms-core@3.3.7) (2024-06-27)
+
+### Bug Fixes
+
+- change AppHeaderButton style fixing [#7208](https://github.com/decaporg/decap-cms/issues/7208) ([#7209](https://github.com/decaporg/decap-cms/issues/7209)) ([7483f19](https://github.com/decaporg/decap-cms/commit/7483f191025b52af8957ea87119ac4f9490b65de))
+- change EditorToolbar position style ([#7198](https://github.com/decaporg/decap-cms/issues/7198)) ([dc71d72](https://github.com/decaporg/decap-cms/commit/dc71d728138cd322b815ae40eb297e43327105b2)), closes [#7197](https://github.com/decaporg/decap-cms/issues/7197)
+
 ## [3.3.6](https://github.com/decaporg/decap-cms/compare/decap-cms-core@3.3.5...decap-cms-core@3.3.6) (2024-03-29)
 
 **Note:** Version bump only for package decap-cms-core

diff --git a/packages/decap-cms-core/package.json b/packages/decap-cms-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-core",
   "description": "Decap CMS core application, see decap-cms package for the main distribution.",
-  "version": "3.3.6",
+  "version": "3.3.7",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-core",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
   "module": "dist/esm/index.js",

diff --git a/packages/decap-cms-core/src/components/App/Header.js b/packages/decap-cms-core/src/components/App/Header.js
@@ -98,7 +98,7 @@ const AppHeaderButton = styled.div`
 
   &:hover,
   &:active,
-  &:focus {
+  &:focus-visible {
     ${styles.buttonActive};
 
     ${Icon} {

diff --git a/packages/decap-cms-core/src/components/Editor/EditorToolbar.js b/packages/decap-cms-core/src/components/Editor/EditorToolbar.js
@@ -652,11 +652,11 @@ export class EditorToolbar extends React.Component {
       </SaveButton>,
       currentStatus
         ? [
-            this.renderWorkflowStatusControls(),
-            !hasChanged && this.renderNewEntryWorkflowPublishControls({ canCreate, canPublish }),
-          ]
+          this.renderWorkflowStatusControls(),
+          !hasChanged && this.renderNewEntryWorkflowPublishControls({ canCreate, canPublish }),
+        ]
         : !isNewEntry &&
-          this.renderExistingEntryWorkflowPublishControls({ canCreate, canPublish, canDelete }),
+        this.renderExistingEntryWorkflowPublishControls({ canCreate, canPublish, canDelete }),
       (!showDelete || useOpenAuthoring) && !hasUnpublishedChanges && !isModification ? null : (
         <DeleteButton
           key="delete-button"

diff --git a/packages/decap-cms-ui-default/CHANGELOG.md b/packages/decap-cms-ui-default/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.2](https://github.com/decaporg/decap-cms/compare/decap-cms-ui-default@3.1.1...decap-cms-ui-default@3.1.2) (2024-06-27)
+
+### Bug Fixes
+
+- display custom logo when using a proxy server ([#7235](https://github.com/decaporg/decap-cms/issues/7235)) ([7feca52](https://github.com/decaporg/decap-cms/commit/7feca52605315a764dfbe1b65c6782a644191dd4))
+
 ## [3.1.1](https://github.com/decaporg/decap-cms/compare/decap-cms-ui-default@3.1.0-beta.2...decap-cms-ui-default@3.1.1) (2024-03-21)
 
 **Note:** Version bump only for package decap-cms-ui-default

diff --git a/packages/decap-cms-ui-default/package.json b/packages/decap-cms-ui-default/package.json
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-ui-default",
   "description": "Default UI components for Decap CMS.",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-ui-default",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
   "license": "MIT",

diff --git a/packages/decap-cms-ui-default/src/AuthenticationPage.js b/packages/decap-cms-ui-default/src/AuthenticationPage.js
@@ -110,4 +110,4 @@ AuthenticationPage.propTypes = {
   t: PropTypes.func.isRequired,
 };
 
-export default AuthenticationPage;
+export { AuthenticationPage as default, renderPageLogo };
diff --git a/packages/decap-cms-ui-default/src/index.js b/packages/decap-cms-ui-default/src/index.js
@@ -10,7 +10,7 @@ import Loader from './Loader';
 import FieldLabel from './FieldLabel';
 import IconButton from './IconButton';
 import Toggle, { ToggleContainer, ToggleBackground, ToggleHandle } from './Toggle';
-import AuthenticationPage from './AuthenticationPage';
+import AuthenticationPage, { renderPageLogo } from './AuthenticationPage';
 import WidgetPreviewContainer from './WidgetPreviewContainer';
 import ObjectWidgetTopBar from './ObjectWidgetTopBar';
 import GoBackButton from './GoBackButton';
@@ -63,6 +63,7 @@ export const DecapCmsUiDefault = {
   zIndex,
   reactSelectStyles,
   GlobalStyles,
+  renderPageLogo,
 };
 export {
   Dropdown,
@@ -97,4 +98,5 @@ export {
   reactSelectStyles,
   GlobalStyles,
   GoBackButton,
+  renderPageLogo,
 };
diff --git a/packages/decap-cms-widget-map/CHANGELOG.md b/packages/decap-cms-widget-map/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.2](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-map@3.1.1...decap-cms-widget-map@3.1.2) (2024-06-27)
+
+### Bug Fixes
+
+- **map-widget:** ensure map renders correctly when expanding initially collapsed sections ([#6541](https://github.com/decaporg/decap-cms/issues/6541)) ([#7229](https://github.com/decaporg/decap-cms/issues/7229)) ([041e34e](https://github.com/decaporg/decap-cms/commit/041e34e51dc14fc8917078961ebb376a2562422b))
+
 ## [3.1.1](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-map@3.1.0-beta.1...decap-cms-widget-map@3.1.1) (2024-03-21)
 
 **Note:** Version bump only for package decap-cms-widget-map

diff --git a/packages/decap-cms-widget-map/package.json b/packages/decap-cms-widget-map/package.json
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-widget-map",
   "description": "Widget for editing spatial data in Decap CMS.",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://www.decapcms.org/docs/widgets/#map",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-widget-map",
   "bugs": "https://github.com/decaporg/decap-cms/issues",

diff --git a/packages/decap-cms-widget-map/src/withMapControl.js b/packages/decap-cms-widget-map/src/withMapControl.js
@@ -45,6 +45,7 @@ export default function withMapControl({ getFormat, getMap } = {}) {
     constructor(props) {
       super(props);
       this.mapContainer = React.createRef();
+      this.resizeObserver = null;
     }
 
     componentDidMount() {
@@ -69,6 +70,18 @@ export default function withMapControl({ getFormat, getMap } = {}) {
         featuresSource.clear();
         onChange(format.writeGeometry(feature.getGeometry(), writeOptions));
       });
+
+      this.resizeObserver = new ResizeObserver(() => {
+        map.updateSize();
+      });
+
+      this.resizeObserver.observe(target);
+    }
+
+    componentWillUnmount() {
+      if (this.resizeObserver) {
+        this.resizeObserver.disconnect();
+      }
     }
 
     render() {

diff --git a/packages/decap-cms/CHANGELOG.md b/packages/decap-cms/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.11](https://github.com/decaporg/decap-cms/compare/decap-cms@3.1.10...decap-cms@3.1.11) (2024-06-27)
+
+**Note:** Version bump only for package decap-cms
+
 ## [3.1.10](https://github.com/decaporg/decap-cms/compare/decap-cms@3.1.9...decap-cms@3.1.10) (2024-04-16)
 
 **Note:** Version bump only for package decap-cms