feat: SizeRelatedInfo add discard property

Author: runjuu

src/Container/Resizer.ts

@@ -1,8 +1,8 @@
 import { SizeRelatedInfo } from '../types';
-import { FilterBarActionScanResult } from './operators';
+import { BarActionScanResult } from './operators';
 import { getNextSizeRelatedInfo } from './utils';
 
-type ResizeResult = SizeRelatedInfo | FilterBarActionScanResult;
+type ResizeResult = SizeRelatedInfo | BarActionScanResult;
 
 function getBarID(indexOfBar: number): number {
   return indexOfBar * 2 + 1;
@@ -83,7 +83,7 @@ export class Resizer {
     return this.getSize(getSectionID(indexOfSection));
   }
 
-  getResult(): SizeRelatedInfo & { discard: boolean } {
+  getResult(): SizeRelatedInfo {
     return { ...this.resizeResult, discard: this.isDiscarded };
   }
 

src/Container/index.tsx

@@ -12,7 +12,7 @@ import {
 import { ResizerProvider } from '../context';
 
 import { Resizer } from './Resizer';
-import { FilterBarActionScanResult, filterBarActionScanResult, scanBarAction } from './operators';
+import { BarActionScanResult, scanBarAction } from './operators';
 import {
   calculateCoordinateOffset,
   collectSizeRelatedInfo,
@@ -34,24 +34,27 @@ class Container extends React.PureComponent<Props> {
 
   private readonly sizeRelatedInfoAction$ = new Subject<SizeRelatedInfo>();
 
-  private readonly sizeRelatedInfo$ = merge<SizeRelatedInfo, FilterBarActionScanResult>(
+  private readonly sizeRelatedInfo$ = merge<
+    SizeRelatedInfo,
+    BarActionScanResult
+  >(
     this.sizeRelatedInfoAction$,
     this.barActions$.pipe(
       scanBarAction({
         calculateOffset: (current, original) =>
           calculateCoordinateOffset(current, original)[this.axis],
         getSizeRelatedInfo: () => this.makeSizeInfos(),
       }),
-      filterBarActionScanResult(),
     ),
   ).pipe(
+    filter(({ discard }) => !discard),
     map((resizeResult) => {
       if (typeof this.props.onResizing === 'function') {
         const resizer = new Resizer(resizeResult);
         this.props.onResizing(resizer);
         return resizer.getResult();
       } else {
-        return { ...resizeResult, discard: false };
+        return resizeResult;
       }
     }),
     filter(({ discard }) => !discard),

src/Container/operators.ts

@@ -1,4 +1,4 @@
-import { filter, scan } from 'rxjs/operators';
+import { scan } from 'rxjs/operators';
 
 import {
   BarAction,
@@ -9,17 +9,11 @@ import {
 } from '../types';
 import { DEFAULT_COORDINATE_OFFSET, getNextSizeRelatedInfo } from './utils';
 
-export type BarActionScanResult = Pick<SizeRelatedInfo, 'flexGrowRatio'> & {
+export interface BarActionScanResult extends SizeRelatedInfo {
   barID: number;
   offset: number;
   type: BarActionType;
   originalCoordinate: Coordinate;
-  defaultSizeInfoArray: SizeInfo[] | null;
-  sizeInfoArray: SizeInfo[] | null;
-};
-
-export interface FilterBarActionScanResult extends BarActionScanResult {
-  sizeInfoArray: SizeInfo[];
   defaultSizeInfoArray: SizeInfo[];
 }
 
@@ -30,11 +24,12 @@ interface ScanBarActionConfig {
 
 const DEFAULT_BAR_ACTION_SCAN_RESULT: BarActionScanResult = {
   barID: -1,
+  offset: 0,
   type: BarActionType.DEACTIVATE,
   originalCoordinate: DEFAULT_COORDINATE_OFFSET,
-  defaultSizeInfoArray: null,
-  sizeInfoArray: null,
-  offset: 0,
+  defaultSizeInfoArray: [],
+  sizeInfoArray: [],
+  discard: true,
   flexGrowRatio: 0,
 };
 
@@ -73,18 +68,10 @@ export function scanBarAction(config: ScanBarActionConfig) {
           offset,
           originalCoordinate: prevResult.originalCoordinate,
           defaultSizeInfoArray: prevResult.defaultSizeInfoArray,
+          discard: false,
         };
       case BarActionType.DEACTIVATE:
         return DEFAULT_BAR_ACTION_SCAN_RESULT;
     }
   }, DEFAULT_BAR_ACTION_SCAN_RESULT);
 }
-
-export function filterBarActionScanResult() {
-  return filter<BarActionScanResult, FilterBarActionScanResult>(
-    (
-      scanResult: BarActionScanResult,
-    ): scanResult is FilterBarActionScanResult =>
-      !!(scanResult.flexGrowRatio && scanResult.sizeInfoArray),
-  );
-}

src/types.ts

@@ -31,6 +31,7 @@ export interface SizeInfo {
 }
 
 export interface SizeRelatedInfo {
+  discard?: boolean;
   sizeInfoArray: SizeInfo[];
   flexGrowRatio: number;
 }