fix(panel): fix data inconsistency

crimx · May 15, 2018 · 1b956aa · 1b956aa
1 parent 799cc4c
commit 1b956aa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/content/components/DictPanel/index.tsx b/src/content/components/DictPanel/index.tsx
@@ -17,7 +17,6 @@ export interface DictPanelProps extends DictPanelDispatchers {
   readonly isPinned: boolean
   readonly dictionaries: DictionariesState['dictionaries']
   readonly allDictsConfig: DictConfigs
-  readonly selectedDicts: DictID[]
   readonly fontSize: number
   readonly panelWidth: number
   readonly isAnimation: boolean
@@ -69,15 +68,17 @@ export default class DictPanel extends React.Component<DictPanelProps> {
       dictionaries,
 
       allDictsConfig,
-      selectedDicts,
       panelWidth,
       fontSize,
       isAnimation,
 
       updateItemHeight,
     } = this.props
 
-    const dictsInfo = dictionaries.dicts
+    const {
+      dicts: dictsInfo,
+      selected: selectedDicts,
+    } = dictionaries
 
     // wrap iframe into DictPanel so that react
     // can release memory correctly after removed from DOM

diff --git a/src/content/components/DictPanelPortal/index.tsx b/src/content/components/DictPanelPortal/index.tsx
@@ -18,7 +18,6 @@ export type DictPanelPortalDispatchers = Omit<
 export interface DictPanelPortalProps extends DictPanelPortalDispatchers {
   readonly isAnimation: boolean
   readonly allDictsConfig: DictConfigs
-  readonly selectedDicts: DictID[]
   readonly fontSize: number
 
   readonly isFav: boolean
@@ -129,8 +128,8 @@ export default class DictPanelPortal extends React.Component<DictPanelPortalProp
   }
 
   onFrameAnimationEnd = () => {
+    this.isAnimating = false
     if (this.frame) {
-      this.isAnimating = false
       // remove hardware acceleration to prevent blurry font
       const iframeStyle = this.frame.style
       const { x, y } = this.props.panelRect

diff --git a/src/content/containers/DictPanelContainer.tsx b/src/content/containers/DictPanelContainer.tsx
@@ -19,7 +19,6 @@ export const mapStateToProps = ({
   return {
     isAnimation: config.animation,
     allDictsConfig: config.dicts.all,
-    selectedDicts: config.dicts.selected,
     fontSize: config.fontSize,
 
     selection,