Update per CR feedback.

google · Oct 10, 2024 · 0bdc4fc · 0bdc4fc
1 parent a2a949c
commit 0bdc4fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/assets/js/components/KeyMetrics/MetricsSelectionPanel/Footer.js b/assets/js/components/KeyMetrics/MetricsSelectionPanel/Footer.js
@@ -52,7 +52,7 @@ import { ERROR_CODE_MISSING_REQUIRED_SCOPE } from '../../../util/errors';
 import useViewContext from '../../../hooks/useViewContext';
 import { trackEvent } from '../../../util';
 import { SelectionPanelFooter } from '../../SelectionPanel';
-import { isFeatureEnabled } from '../../../features';
+import { useFeature } from '../../../hooks/useFeature';
 
 export default function Footer( {
 	isOpen,
@@ -61,9 +61,7 @@ export default function Footer( {
 	onNavigationToOAuthURL = () => {},
 } ) {
 	const viewContext = useViewContext();
-	const isConversionReportingEnabled = isFeatureEnabled(
-		'conversionReporting'
-	);
+	const isConversionReportingEnabled = useFeature( 'conversionReporting' );
 
 	const selectedMetrics = useSelect( ( select ) =>
 		select( CORE_FORMS ).getValue(

diff --git a/assets/js/googlesitekit/widgets/datastore/widgets.js b/assets/js/googlesitekit/widgets/datastore/widgets.js
@@ -83,7 +83,7 @@ export const actions = {
 	 * @param {string|Array.<string>} [settings.modules]           Optional. Widget's associated modules.
 	 * @param {Function}              [settings.isActive]          Optional. Callback function to determine if the widget is active.
 	 * @param {Function}              [settings.isPreloaded]       Optional. Callback function to determine if the widget should be preloaded if not active (requires isActive).
-	 * @param {string|Array.<string>} [settings.hideOnBreakpoints] Optional. Hide widget on selected breakpoints. One of: "BREAKPOINT_SMALL", "BREAKPOINT_TABLET", "BREAKPOINT_DESKTOP", "BREAKPOINT_XLARGE".
+	 * @param {Array.<string>}        [settings.hideOnBreakpoints] Optional. Hide widget on selected breakpoints. Array with any of: `BREAKPOINT_SMALL`, `BREAKPOINT_TABLET`, `BREAKPOINT_DESKTOP`, `BREAKPOINT_XLARGE`.
 	 * @return {Object} Redux-style action.
 	 */
 	registerWidget(

diff --git a/assets/js/googlesitekit/widgets/index.js b/assets/js/googlesitekit/widgets/index.js
@@ -89,7 +89,7 @@ export function createWidgets( registry ) {
 		 * @param {string|Array.<string>} [settings.width]             Optional. Widget's maximum width to occupy. Default is: "quarter". One of: "quarter", "half", "full".
 		 * @param {boolean}               [settings.wrapWidget]        Optional. Whether to wrap the component with the <Widget> wrapper. Default is: true.
 		 * @param {string|Array.<string>} [settings.modules]           Optional. Widget's associated moduels.
-		 * @param {string|Array.<string>} [settings.hideOnBreakpoints] Optional. Hide widget on selected breakpoints. One of: "BREAKPOINT_SMALL", "BREAKPOINT_TABLET", "BREAKPOINT_DESKTOP", "BREAKPOINT_XLARGE".
+		 * @param {Array.<string>}        [settings.hideOnBreakpoints] Optional. Hide widget on selected breakpoints. Array with any of: `BREAKPOINT_SMALL`, `BREAKPOINT_TABLET`, `BREAKPOINT_DESKTOP`, `BREAKPOINT_XLARGE`.
 		 * @param {(string|Array)}        [widgetAreaSlugs]            Optional. Widget area slug(s).
 		 */
 		registerWidget( slug, settings, widgetAreaSlugs ) {