Rename SlotFillConsumer to Consumer to be inline with provider name

WordPress · Oct 31, 2018 · d04fb12 · d04fb12
1 parent 08dfc36
commit d04fb12
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/packages/components/src/popover/index.js b/packages/components/src/popover/index.js
@@ -19,7 +19,7 @@ import withConstrainedTabbing from '../higher-order/with-constrained-tabbing';
 import PopoverDetectOutside from './detect-outside';
 import IconButton from '../icon-button';
 import ScrollLock from '../scroll-lock';
-import { Slot, Fill, SlotFillConsumer } from '../slot-fill';
+import { Slot, Fill, Consumer } from '../slot-fill';
 
 const FocusManaged = withConstrainedTabbing( withFocusReturn( ( { children } ) => children ) );
 
@@ -302,7 +302,7 @@ class Popover extends Component {
 		}
 
 		return (
-			<SlotFillConsumer>
+			<Consumer>
 				{ ( { getSlot } ) => {
 					// In case there is no slot context in which to render,
 					// default to an in-place rendering.
@@ -317,7 +317,7 @@ class Popover extends Component {
 						</span>
 					);
 				} }
-			</SlotFillConsumer>
+			</Consumer>
 		);
 	}
 }

diff --git a/packages/components/src/slot-fill/fill.js b/packages/components/src/slot-fill/fill.js
@@ -11,12 +11,12 @@ import { Component, createPortal } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { SlotFillConsumer } from './provider';
+import { Consumer } from './provider';
 
 let occurrences = 0;
 
 const Fill = ( props ) => (
-	<SlotFillConsumer>
+	<Consumer>
 		{ ( { getSlot, registerFill, unregisterFill } ) => (
 			<FillComponent
 				{ ...props }
@@ -25,7 +25,7 @@ const Fill = ( props ) => (
 				unregisterFill={ unregisterFill }
 			/>
 		) }
-	</SlotFillConsumer>
+	</Consumer>
 );
 
 class FillComponent extends Component {

diff --git a/packages/components/src/slot-fill/index.js b/packages/components/src/slot-fill/index.js
@@ -3,11 +3,11 @@
  */
 import Slot from './slot';
 import Fill from './fill';
-import Provider, { SlotFillConsumer } from './provider';
+import Provider, { Consumer } from './provider';
 
 export { Slot };
 export { Fill };
-export { Provider, SlotFillConsumer };
+export { Provider, Consumer };
 
 export function createSlotFill( name ) {
 	const FillComponent = ( props ) => <Fill name={ name } { ...props } />;

diff --git a/packages/components/src/slot-fill/provider.js b/packages/components/src/slot-fill/provider.js
@@ -109,4 +109,4 @@ class SlotFillProvider extends Component {
 }
 
 export default SlotFillProvider;
-export { Consumer as SlotFillConsumer };
+export { Consumer };
diff --git a/packages/components/src/slot-fill/slot.js b/packages/components/src/slot-fill/slot.js
@@ -22,10 +22,10 @@ import {
 /**
  * Internal dependencies
  */
-import { SlotFillConsumer } from './provider';
+import { Consumer } from './provider';
 
 const Slot = ( props ) => (
-	<SlotFillConsumer>
+	<Consumer>
 		{ ( { registerSlot, unregisterSlot, getFills } ) => (
 			<SlotComponent
 				{ ...props }
@@ -34,7 +34,7 @@ const Slot = ( props ) => (
 				getFills={ getFills }
 			/>
 		) }
-	</SlotFillConsumer>
+	</Consumer>
 );
 
 class SlotComponent extends Component {