Fix: Keep minSize, even when size is undefined

Gwe-n · Gwe-n · commit 3612e25d8e2d · 2020-08-27T15:20:52.000+02:00
Fix angular-split#255
diff --git a/projects/angular-split/src/lib/component/split.component.ts b/projects/angular-split/src/lib/component/split.component.ts
@@ -404,7 +404,7 @@ export class SplitComponent implements AfterViewInit, OnDestroy {
             if (wildcardSizeAreas.length === 0 && this.displayedAreas.length > 0) {
               this.displayedAreas.forEach((area, i) => {
                 area.size = i === 0 ? null : area.component.size
-                area.minSize = i === 0 ? null : getAreaMinSize(area)
+                area.minSize = i === 0 ? area.component.minSize : getAreaMinSize(area)
                 area.maxSize = i === 0 ? null : getAreaMaxSize(area)
               })
             }
diff --git a/projects/angular-split/src/lib/utils.ts b/projects/angular-split/src/lib/utils.ts
@@ -51,10 +51,6 @@ export function isUserSizesValid(unit: 'percent' | 'pixel', sizes: Array<number
 }
 
 export function getAreaMinSize(a: IArea): null | number {
-  if (a.size === null) {
-    return null
-  }
-
   if (a.component.lockSize === true) {
     return a.size
   }
@@ -63,10 +59,6 @@ export function getAreaMinSize(a: IArea): null | number {
     return null
   }
 
-  if (a.component.minSize > a.size) {
-    return a.size
-  }
-
   return a.component.minSize
 }
 

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ export class SplitComponent implements AfterViewInit, OnDestroy {`
`404`	`404`	`if (wildcardSizeAreas.length === 0 && this.displayedAreas.length > 0) {`
`405`	`405`	`this.displayedAreas.forEach((area, i) => {`
`406`	`406`	`area.size = i === 0 ? null : area.component.size`
`407`		`- area.minSize = i === 0 ? null : getAreaMinSize(area)`
	`407`	`+ area.minSize = i === 0 ? area.component.minSize : getAreaMinSize(area)`
`408`	`408`	`area.maxSize = i === 0 ? null : getAreaMaxSize(area)`
`409`	`409`	`})`
`410`	`410`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,6 @@ export function isUserSizesValid(unit: 'percent' \| 'pixel', sizes: Array<number`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`export function getAreaMinSize(a: IArea): null \| number {`
`54`		`- if (a.size === null) {`
`55`		`- return null`
`56`		`- }`
`57`		`-`
`58`	`54`	`if (a.component.lockSize === true) {`
`59`	`55`	`return a.size`
`60`	`56`	`}`
`@@ -63,10 +59,6 @@ export function getAreaMinSize(a: IArea): null \| number {`
`63`	`59`	`return null`
`64`	`60`	`}`
`65`	`61`
`66`		`- if (a.component.minSize > a.size) {`
`67`		`- return a.size`
`68`		`- }`
`69`		`-`
`70`	`62`	`return a.component.minSize`
`71`	`63`	`}`
`72`	`64`