[WIP] Not working

bertrandg · bertrandg · commit 2a0ca46b0b63 · 2018-12-14T00:42:11.000+01:00
diff --git a/projects/angular-split/src/lib/component/split.component.ts b/projects/angular-split/src/lib/component/split.component.ts
@@ -499,25 +499,23 @@ export class SplitComponent implements AfterViewInit, OnDestroy {
         // Need to know if each gutter side areas could reacts to steppedOffset
 
         const areasBefore: ISplitSideAbsorptionCapacity = this.snapshot.areasBeforeGutter.reduce((acc, area) => {
-            const res = getAreaAbsorptionCapacity(this.unit, area, acc.remain);
+            const res = getAreaAbsorptionCapacity(this.unit, area, acc.remain, this.snapshot.containerSizePixel);
             acc.list.push(res);
             acc.remain  = res.pixelRemain;
             return acc;
         }, {remain: -steppedOffset, list: []});
-        
-        if(areasBefore.remain !== 0) return;
 
-        const areasAfter: ISplitSideAbsorptionCapacity = this.snapshot.areasAfterGutter.reduce((acc, a) => {
-            const res = getAreaAbsorptionCapacity(this.unit, a, acc.remain);
+        const areasAfter: ISplitSideAbsorptionCapacity = this.snapshot.areasAfterGutter.reduce((acc, area) => {
+            const res = getAreaAbsorptionCapacity(this.unit, area, acc.remain, this.snapshot.containerSizePixel);
             acc.list.push(res);
             acc.remain  = res.pixelRemain;
             return acc;
         }, {remain: steppedOffset, list: []});
 
-        if(areasAfter.remain !== 0) return;
-
         // Now we know areas could absorb steppedOffset, time to really update sizes
 
+        console.log('A', areasBefore.list[0].pixelAbsorb, areasBefore.list[0].percentAfterAbsorption);
+        console.log('B', areasAfter.list[0].pixelAbsorb, areasAfter.list[0].percentAfterAbsorption);
         areasBefore.list.forEach(item => updateAreaSize(this.unit, item));
         areasAfter.list.forEach(item => updateAreaSize(this.unit, item));
 
diff --git a/projects/angular-split/src/lib/utils.ts b/projects/angular-split/src/lib/utils.ts
@@ -48,7 +48,7 @@ export function isUserSizesValid(unit: 'percent' | 'pixel', sizes: Array<number
     }
 }
 
-export function getAreaAbsorptionCapacity(unit: 'percent' | 'pixel', areaSnapshot: IAreaSnapshot, pixels: number): IAreaAbsorptionCapacity {
+export function getAreaAbsorptionCapacity(unit: 'percent' | 'pixel', areaSnapshot: IAreaSnapshot, pixels: number, containerSizePixel: number): IAreaAbsorptionCapacity {
     // No pain no gain
     if(pixels === 0) {
         return {
@@ -70,14 +70,14 @@ export function getAreaAbsorptionCapacity(unit: 'percent' | 'pixel', areaSnapsho
     }
     
 	if(unit === 'pixel') {
-        return getAreaAbsorptionCapacityPixel(areaSnapshot, pixels);
+        return getAreaAbsorptionCapacityPixel(areaSnapshot, pixels, containerSizePixel);
     }
     else if(unit === 'percent') {
-        return getAreaAbsorptionCapacityPercent(areaSnapshot, pixels);
+        return getAreaAbsorptionCapacityPercent(areaSnapshot, pixels, containerSizePixel);
     }
 }
 
-function getAreaAbsorptionCapacityPercent(areaSnapshot: IAreaSnapshot, pixels: number): IAreaAbsorptionCapacity {
+function getAreaAbsorptionCapacityPercent(areaSnapshot: IAreaSnapshot, pixels: number, containerSizePixel: number): IAreaAbsorptionCapacity {
     const tempPixelSize = areaSnapshot.sizePixelAtStart + pixels;
     const tempPercentSize = tempPixelSize / areaSnapshot.sizePixelAtStart * areaSnapshot.sizePercentAtStart;
 
@@ -95,10 +95,19 @@ function getAreaAbsorptionCapacityPercent(areaSnapshot: IAreaSnapshot, pixels: n
                 pixelRemain: pixels - maxPixelAbsorb
             };
         }
+        else if(areaSnapshot.sizePixelAtStart === 0) {
+            console.log('TODO percentAfterAbsorption', (pixels / containerSizePixel * 100))
+            return {
+                areaSnapshot,
+                pixelAbsorb: pixels,
+                percentAfterAbsorption: pixels / containerSizePixel * 100,
+                pixelRemain: pixels,
+            };
+        }
         return {
             areaSnapshot,
             pixelAbsorb: pixels,
-            percentAfterAbsorption: tempPercentSize,
+            percentAfterAbsorption: tempPercentSize > 100 ? 100 : tempPercentSize,
             pixelRemain: 0
         };
     }
@@ -124,7 +133,7 @@ function getAreaAbsorptionCapacityPercent(areaSnapshot: IAreaSnapshot, pixels: n
                 areaSnapshot,
                 pixelAbsorb: -areaSnapshot.sizePixelAtStart,
                 percentAfterAbsorption: 0,
-                pixelRemain: pixels - areaSnapshot.sizePixelAtStart
+                pixelRemain: pixels + areaSnapshot.sizePixelAtStart
             };
         }
         return {
@@ -136,7 +145,7 @@ function getAreaAbsorptionCapacityPercent(areaSnapshot: IAreaSnapshot, pixels: n
     }
 }
 
-function getAreaAbsorptionCapacityPixel(areaSnapshot: IAreaSnapshot, pixels: number): IAreaAbsorptionCapacity {
+function getAreaAbsorptionCapacityPixel(areaSnapshot: IAreaSnapshot, pixels: number, containerSizePixel: number): IAreaAbsorptionCapacity {
     const tempPixelSize = areaSnapshot.sizePixelAtStart + pixels;
             
     // ENLARGE AREA

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ export function isUserSizesValid(unit: 'percent' \| 'pixel', sizes: Array<number`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-export function getAreaAbsorptionCapacity(unit: 'percent' \| 'pixel', areaSnapshot: IAreaSnapshot, pixels: number): IAreaAbsorptionCapacity {`
	`51`	`+export function getAreaAbsorptionCapacity(unit: 'percent' \| 'pixel', areaSnapshot: IAreaSnapshot, pixels: number, containerSizePixel: number): IAreaAbsorptionCapacity {`
`52`	`52`	`// No pain no gain`
`53`	`53`	`if(pixels === 0) {`
`54`	`54`	`return {`
`@@ -70,14 +70,14 @@ export function getAreaAbsorptionCapacity(unit: 'percent' \| 'pixel', areaSnapsho`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`if(unit === 'pixel') {`
`73`		`- return getAreaAbsorptionCapacityPixel(areaSnapshot, pixels);`
	`73`	`+ return getAreaAbsorptionCapacityPixel(areaSnapshot, pixels, containerSizePixel);`
`74`	`74`	`}`
`75`	`75`	`else if(unit === 'percent') {`
`76`		`- return getAreaAbsorptionCapacityPercent(areaSnapshot, pixels);`
	`76`	`+ return getAreaAbsorptionCapacityPercent(areaSnapshot, pixels, containerSizePixel);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`		`-function getAreaAbsorptionCapacityPercent(areaSnapshot: IAreaSnapshot, pixels: number): IAreaAbsorptionCapacity {`
	`80`	`+function getAreaAbsorptionCapacityPercent(areaSnapshot: IAreaSnapshot, pixels: number, containerSizePixel: number): IAreaAbsorptionCapacity {`
`81`	`81`	`const tempPixelSize = areaSnapshot.sizePixelAtStart + pixels;`
`82`	`82`	`const tempPercentSize = tempPixelSize / areaSnapshot.sizePixelAtStart * areaSnapshot.sizePercentAtStart;`
`83`	`83`
`@@ -95,10 +95,19 @@ function getAreaAbsorptionCapacityPercent(areaSnapshot: IAreaSnapshot, pixels: n`
`95`	`95`	`pixelRemain: pixels - maxPixelAbsorb`
`96`	`96`	`};`
`97`	`97`	`}`
	`98`	`+ else if(areaSnapshot.sizePixelAtStart === 0) {`
	`99`	`+ console.log('TODO percentAfterAbsorption', (pixels / containerSizePixel * 100))`
	`100`	`+ return {`
	`101`	`+ areaSnapshot,`
	`102`	`+ pixelAbsorb: pixels,`
	`103`	`+ percentAfterAbsorption: pixels / containerSizePixel * 100,`
	`104`	`+ pixelRemain: pixels,`
	`105`	`+ };`
	`106`	`+ }`
`98`	`107`	`return {`
`99`	`108`	`areaSnapshot,`
`100`	`109`	`pixelAbsorb: pixels,`
`101`		`- percentAfterAbsorption: tempPercentSize,`
	`110`	`+ percentAfterAbsorption: tempPercentSize > 100 ? 100 : tempPercentSize,`
`102`	`111`	`pixelRemain: 0`
`103`	`112`	`};`
`104`	`113`	`}`
`@@ -124,7 +133,7 @@ function getAreaAbsorptionCapacityPercent(areaSnapshot: IAreaSnapshot, pixels: n`
`124`	`133`	`areaSnapshot,`
`125`	`134`	`pixelAbsorb: -areaSnapshot.sizePixelAtStart,`
`126`	`135`	`percentAfterAbsorption: 0,`
`127`		`- pixelRemain: pixels - areaSnapshot.sizePixelAtStart`
	`136`	`+ pixelRemain: pixels + areaSnapshot.sizePixelAtStart`
`128`	`137`	`};`
`129`	`138`	`}`
`130`	`139`	`return {`
`@@ -136,7 +145,7 @@ function getAreaAbsorptionCapacityPercent(areaSnapshot: IAreaSnapshot, pixels: n`
`136`	`145`	`}`
`137`	`146`	`}`
`138`	`147`
`139`		`-function getAreaAbsorptionCapacityPixel(areaSnapshot: IAreaSnapshot, pixels: number): IAreaAbsorptionCapacity {`
	`148`	`+function getAreaAbsorptionCapacityPixel(areaSnapshot: IAreaSnapshot, pixels: number, containerSizePixel: number): IAreaAbsorptionCapacity {`
`140`	`149`	`const tempPixelSize = areaSnapshot.sizePixelAtStart + pixels;`
`141`	`150`
`142`	`151`	`// ENLARGE AREA`