Browse Source

ref(js): Use CommonStoreDefinition for ModalStore (#40166)

Evan Purkhiser 2 years ago
parent
commit
587cf1d2bd
2 changed files with 9 additions and 8 deletions
  1. 2 2
      static/app/components/globalModal/index.tsx
  2. 7 6
      static/app/stores/modalStore.tsx

+ 2 - 2
static/app/components/globalModal/index.tsx

@@ -264,12 +264,12 @@ const Content = styled('div')`
 `;
 
 type State = {
-  modalStore: ReturnType<typeof ModalStore.get>;
+  modalStore: ReturnType<typeof ModalStore.getState>;
 };
 
 class GlobalModalContainer extends Component<Partial<Props>, State> {
   state: State = {
-    modalStore: ModalStore.get(),
+    modalStore: ModalStore.getState(),
   };
 
   componentWillUnmount() {

+ 7 - 6
static/app/stores/modalStore.tsx

@@ -1,18 +1,19 @@
-import {createStore, StoreDefinition} from 'reflux';
+import {createStore} from 'reflux';
 
 import {ModalOptions, ModalRenderProps} from 'sentry/actionCreators/modal';
 
+import {CommonStoreDefinition} from './types';
+
 type Renderer = (renderProps: ModalRenderProps) => React.ReactNode;
 
-type ModalStoreState = {
+type State = {
   options: ModalOptions;
   renderer: Renderer | null;
 };
 
-interface ModalStoreDefinition extends StoreDefinition {
+interface ModalStoreDefinition extends CommonStoreDefinition<State> {
   closeModal(): void;
-  get(): ModalStoreState;
-  getState(): ModalStoreState;
+  getState(): State;
   init(): void;
   openModal(renderer: Renderer, options: ModalOptions): void;
   reset(): void;
@@ -38,7 +39,7 @@ const storeConfig: ModalStoreDefinition = {
     this.state = {
       renderer: null,
       options: {},
-    } as ModalStoreState;
+    } as State;
   },
 
   closeModal() {