Merge branch 'main' into new-rule

# Conflicts: # packages/story-editor/src/components/mediaRecording/provider.js
GoogleForCreators · Jul 4, 2022 · 35e9968 · 35e9968
2 parents 1453124 + 417843a
commit 35e9968
Show file tree

Hide file tree

Showing 9 changed files with 276 additions and 219 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -596,6 +596,7 @@
         "packages/tinymce-button/**/*.js"
       ],
       "rules":{
+        "@wordpress/data-no-store-string-literals": "error",
         "no-restricted-imports": [
           "error",
           {

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/design-system/src/components/contextMenu/components/button.js b/packages/design-system/src/components/contextMenu/components/button.js
@@ -31,7 +31,7 @@ import { menuItemStyles } from './styles';
 const StyledButton = styled(BaseButton)`
   ${menuItemStyles};
 
-  width: 100%;
+  width: auto;
 
   ${({ isHorizontal, isIconMenu, forcePadding, theme }) => {
     const hasHeight = isHorizontal; // In a horizontal menu, all buttons are 32px high

diff --git a/packages/stories-block/package.json b/packages/stories-block/package.json
@@ -37,11 +37,13 @@
     "@wordpress/blocks": "^11.10.0",
     "@wordpress/components": "^19.13.0",
     "@wordpress/compose": "^5.9.0",
+    "@wordpress/core-data": "^4.10.0",
     "@wordpress/data": "^6.11.0",
     "@wordpress/date": "^4.11.0",
     "@wordpress/element": "^4.9.0",
     "@wordpress/i18n": "^4.11.0",
     "@wordpress/icons": "^9.2.0",
+    "@wordpress/notices": "^3.12.0",
     "@wordpress/url": "^3.12.0",
     "@wordpress/viewport": "^4.9.0",
     "classnames": "^2.3.1",

diff --git a/packages/stories-block/src/block/block-types/single-story/edit.js b/packages/stories-block/src/block/block-types/single-story/edit.js
@@ -32,6 +32,7 @@ import * as compose from '@wordpress/compose';
 import { withViewportMatch } from '@wordpress/viewport';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
+import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -195,15 +196,15 @@ function StoryEmbedEdit({
   }, []);
 
   const { isRTL, maxWidth } = useSelect((select) => {
-    const { getSettings } = select('core/block-editor');
+    const { getSettings } = select(blockEditorStore);
     const settings = getSettings();
     return {
       isRTL: settings.isRTL,
       maxWidth: settings.maxWidth,
     };
   }, []);
 
-  const { toggleSelection } = useDispatch('core/block-editor');
+  const { toggleSelection } = useDispatch(blockEditorStore);
 
   if (showLoadingIndicator) {
     return <EmbedLoadinng />;

diff --git a/packages/stories-block/src/block/components/storyPicker/fetchSelectedStories.js b/packages/stories-block/src/block/components/storyPicker/fetchSelectedStories.js
@@ -28,6 +28,7 @@ import { useEffect } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
 import { useDispatch } from '@wordpress/data';
+import { store as noticesStore } from '@wordpress/notices';
 
 /**
  * Internal dependencies
@@ -47,7 +48,7 @@ function FetchSelectedStories({
   setSelectedStories,
   setIsFetching,
 }) {
-  const { createErrorNotice } = useDispatch('core/notices');
+  const { createErrorNotice } = useDispatch(noticesStore);
 
   const fetchStories = async () => {
     try {

diff --git a/packages/stories-block/src/block/components/storyPicker/selectStories.js b/packages/stories-block/src/block/components/storyPicker/selectStories.js
@@ -38,6 +38,7 @@ import {
 } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import { useDebounce } from '@wordpress/compose';
+import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
@@ -139,7 +140,7 @@ function SelectStories({
         search: authorKeyword,
       };
 
-      const { getAuthors } = select('core');
+      const { getAuthors } = select(coreStore);
 
       return {
         // Not using `getUsers()` because it requires `list_users` capability.

diff --git a/packages/stories-block/src/block/components/storyPicker/storyPicker.js b/packages/stories-block/src/block/components/storyPicker/storyPicker.js
@@ -27,6 +27,7 @@ import { useState, useEffect, useCallback } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
 import { useDispatch } from '@wordpress/data';
 import { addQueryArgs } from '@wordpress/url';
+import { store as noticesStore } from '@wordpress/notices';
 
 /**
  * Internal dependencies
@@ -49,7 +50,7 @@ function StoryPicker({
   setIsSortingStories = () => {},
   maxNumOfStories,
 }) {
-  const { createErrorNotice } = useDispatch('core/notices');
+  const { createErrorNotice } = useDispatch(noticesStore);
 
   const [localSelectedStories, setLocalSelectedStories] =
     useState(selectedStories);

diff --git a/packages/story-editor/src/components/mediaRecording/provider.js b/packages/story-editor/src/components/mediaRecording/provider.js
@@ -98,7 +98,7 @@ function MediaRecordingProvider({ children }) {
         trackError('media_recording_capture', e.message);
         showSnackbar({
           message: __(
-            'There was an error taking a photo. Please try again.',
+            'There was an error recording a video. Please try again.',
             'web-stories'
           ),
           dismissable: true,