From eb3f8268fa2d26e6fa17ca69e3cad6dfdfe232ae Mon Sep 17 00:00:00 2001
From: Matthew Bentley <mabentley85@gmail.com>
Date: Thu, 28 May 2020 12:23:46 -0700
Subject: [PATCH 1/8] Added Event Forwarding To Pagination

---
 src/components/Pagination/Pagination.svelte | 24 ++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/components/Pagination/Pagination.svelte b/src/components/Pagination/Pagination.svelte
index 83724018..103a5517 100644
--- a/src/components/Pagination/Pagination.svelte
+++ b/src/components/Pagination/Pagination.svelte
@@ -22,6 +22,19 @@
   import CaretRight24 from 'carbon-icons-svelte/lib/CaretRight24';
   import { cx, fillArray } from '../../lib';
   import Select, { SelectItem } from '../Select';
+  import { createEventDispatcher } from 'svelte';
+
+  const dispatch = createEventDispatcher();
+  const handlePaginationChange = (type, value) => {
+      if (type === 'pageSize') {
+        page = 1;
+        pageSize = value;
+      } else {
+        page = value;
+      }
+
+      dispatch('update', {pageSize, page});
+  };  
 
   $: totalPages = Math.max(Math.ceil(totalItems / pageSize), 1);
   $: selectItems = fillArray(totalPages);
@@ -43,9 +56,9 @@
       labelText=""
       hideLabel
       noLabel
-      inline
-      on:change={() => {
-        page = 1;
+      inline      
+      on:blur={() => {
+        handlePaginationChange('pageSize', pageSize);
       }}
       bind:selected={pageSize}>
       {#each pageSizes as size, i (size)}
@@ -68,6 +81,9 @@
         labelText={`Page number, of ${totalPages} pages`}
         inline
         hideLabel
+        on:blur={() => {
+          handlePaginationChange('page', page);          
+        }}
         bind:selected={page}>
         {#each selectItems as size, i (size)}
           <SelectItem value={size + 1} text={(size + 1).toString()} />
@@ -82,6 +98,7 @@
       class={cx('--pagination__button', '--pagination__button--backward', backButtonDisabled && '--pagination__button--no-index')}
       on:click={() => {
         page--;
+        handlePaginationChange('page', page);        
       }}
       aria-label={backwardText}
       disabled={backButtonDisabled}>
@@ -93,6 +110,7 @@
       aria-label={forwardText}
       on:click={() => {
         page++;
+        handlePaginationChange('page', page);        
       }}
       disabled={forwardButtonDisabled}>
       <CaretRight24 />

From 8f27c983a594d67e1bd6254b03a7a5063aeac9d5 Mon Sep 17 00:00:00 2001
From: Matthew Bentley <mabentley85@gmail.com>
Date: Fri, 29 May 2020 10:04:09 -0700
Subject: [PATCH 2/8] Made use of after update

---
 src/components/Pagination/Pagination.svelte | 34 ++++++---------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/components/Pagination/Pagination.svelte b/src/components/Pagination/Pagination.svelte
index 103a5517..56a149b0 100644
--- a/src/components/Pagination/Pagination.svelte
+++ b/src/components/Pagination/Pagination.svelte
@@ -17,24 +17,18 @@
   export let pageText = page => `page ${page}`;
   export let style = undefined;
   export let totalItems = 0;
-
+  
   import CaretLeft24 from 'carbon-icons-svelte/lib/CaretLeft24';
   import CaretRight24 from 'carbon-icons-svelte/lib/CaretRight24';
   import { cx, fillArray } from '../../lib';
   import Select, { SelectItem } from '../Select';
-  import { createEventDispatcher } from 'svelte';
+  import { afterUpdate, createEventDispatcher } from 'svelte';  
 
   const dispatch = createEventDispatcher();
-  const handlePaginationChange = (type, value) => {
-      if (type === 'pageSize') {
-        page = 1;
-        pageSize = value;
-      } else {
-        page = value;
-      }
 
-      dispatch('update', {pageSize, page});
-  };  
+  afterUpdate(() => {
+    dispatch('update', {pageSize, page});
+	});
 
   $: totalPages = Math.max(Math.ceil(totalItems / pageSize), 1);
   $: selectItems = fillArray(totalPages);
@@ -57,9 +51,6 @@
       hideLabel
       noLabel
       inline      
-      on:blur={() => {
-        handlePaginationChange('pageSize', pageSize);
-      }}
       bind:selected={pageSize}>
       {#each pageSizes as size, i (size)}
         <SelectItem value={size} text={size.toString()} />
@@ -80,10 +71,7 @@
         class={cx('--select__page-number')}
         labelText={`Page number, of ${totalPages} pages`}
         inline
-        hideLabel
-        on:blur={() => {
-          handlePaginationChange('page', page);          
-        }}
+        hideLabel        
         bind:selected={page}>
         {#each selectItems as size, i (size)}
           <SelectItem value={size + 1} text={(size + 1).toString()} />
@@ -96,9 +84,8 @@
     <button
       type="button"
       class={cx('--pagination__button', '--pagination__button--backward', backButtonDisabled && '--pagination__button--no-index')}
-      on:click={() => {
-        page--;
-        handlePaginationChange('page', page);        
+      on:click|capture={() => {
+        page--;        
       }}
       aria-label={backwardText}
       disabled={backButtonDisabled}>
@@ -108,9 +95,8 @@
       type="button"
       class={cx('--pagination__button', '--pagination__button--forward', forwardButtonDisabled && '--pagination__button--no-index')}
       aria-label={forwardText}
-      on:click={() => {
-        page++;
-        handlePaginationChange('page', page);        
+      on:click|capture={() => {
+        page++;        
       }}
       disabled={forwardButtonDisabled}>
       <CaretRight24 />

From c296ef271c8de55da886f561679883292dd4e315 Mon Sep 17 00:00:00 2001
From: Matthew Bentley <mabentley85@gmail.com>
Date: Fri, 29 May 2020 10:05:56 -0700
Subject: [PATCH 3/8] Removed white space

---
 src/components/Pagination/Pagination.svelte | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Pagination/Pagination.svelte b/src/components/Pagination/Pagination.svelte
index 56a149b0..29956d14 100644
--- a/src/components/Pagination/Pagination.svelte
+++ b/src/components/Pagination/Pagination.svelte
@@ -17,7 +17,7 @@
   export let pageText = page => `page ${page}`;
   export let style = undefined;
   export let totalItems = 0;
-  
+
   import CaretLeft24 from 'carbon-icons-svelte/lib/CaretLeft24';
   import CaretRight24 from 'carbon-icons-svelte/lib/CaretRight24';
   import { cx, fillArray } from '../../lib';
@@ -71,7 +71,7 @@
         class={cx('--select__page-number')}
         labelText={`Page number, of ${totalPages} pages`}
         inline
-        hideLabel        
+        hideLabel
         bind:selected={page}>
         {#each selectItems as size, i (size)}
           <SelectItem value={size + 1} text={(size + 1).toString()} />
@@ -85,7 +85,7 @@
       type="button"
       class={cx('--pagination__button', '--pagination__button--backward', backButtonDisabled && '--pagination__button--no-index')}
       on:click|capture={() => {
-        page--;        
+        page--;
       }}
       aria-label={backwardText}
       disabled={backButtonDisabled}>
@@ -96,7 +96,7 @@
       class={cx('--pagination__button', '--pagination__button--forward', forwardButtonDisabled && '--pagination__button--no-index')}
       aria-label={forwardText}
       on:click|capture={() => {
-        page++;        
+        page++;
       }}
       disabled={forwardButtonDisabled}>
       <CaretRight24 />

From 577d39f7351857c914910c8d3a2bea549d513ffb Mon Sep 17 00:00:00 2001
From: Matthew Bentley <mabentley85@gmail.com>
Date: Fri, 29 May 2020 10:07:08 -0700
Subject: [PATCH 4/8] removed event modifiers

---
 src/components/Pagination/Pagination.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Pagination/Pagination.svelte b/src/components/Pagination/Pagination.svelte
index 29956d14..918c7bd8 100644
--- a/src/components/Pagination/Pagination.svelte
+++ b/src/components/Pagination/Pagination.svelte
@@ -84,7 +84,7 @@
     <button
       type="button"
       class={cx('--pagination__button', '--pagination__button--backward', backButtonDisabled && '--pagination__button--no-index')}
-      on:click|capture={() => {
+      on:click={() => {
         page--;
       }}
       aria-label={backwardText}
@@ -95,7 +95,7 @@
       type="button"
       class={cx('--pagination__button', '--pagination__button--forward', forwardButtonDisabled && '--pagination__button--no-index')}
       aria-label={forwardText}
-      on:click|capture={() => {
+      on:click={() => {
         page++;
       }}
       disabled={forwardButtonDisabled}>

From 001f22216e17d83468310d53bdc22379ca5e5917 Mon Sep 17 00:00:00 2001
From: Matthew Bentley <mabentley85@gmail.com>
Date: Fri, 29 May 2020 10:10:00 -0700
Subject: [PATCH 5/8] Restored onChange handling for pageSize change

---
 src/components/Pagination/Pagination.svelte | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/Pagination/Pagination.svelte b/src/components/Pagination/Pagination.svelte
index 918c7bd8..88109da7 100644
--- a/src/components/Pagination/Pagination.svelte
+++ b/src/components/Pagination/Pagination.svelte
@@ -50,7 +50,10 @@
       labelText=""
       hideLabel
       noLabel
-      inline      
+      inline
+      on:change={() => {
+        page = 1;
+      }} 
       bind:selected={pageSize}>
       {#each pageSizes as size, i (size)}
         <SelectItem value={size} text={size.toString()} />

From ba9462dc73719cb73b80bef812f9bd0676e1eeb6 Mon Sep 17 00:00:00 2001
From: Matthew Bentley <mabentley85@gmail.com>
Date: Fri, 29 May 2020 10:10:33 -0700
Subject: [PATCH 6/8] Removed white space

---
 src/components/Pagination/Pagination.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Pagination/Pagination.svelte b/src/components/Pagination/Pagination.svelte
index 88109da7..41c9fa19 100644
--- a/src/components/Pagination/Pagination.svelte
+++ b/src/components/Pagination/Pagination.svelte
@@ -53,7 +53,7 @@
       inline
       on:change={() => {
         page = 1;
-      }} 
+      }}
       bind:selected={pageSize}>
       {#each pageSizes as size, i (size)}
         <SelectItem value={size} text={size.toString()} />

From 8ab2b2c1e393b8b9fde696c8816a7acf2da57912 Mon Sep 17 00:00:00 2001
From: Matthew Bentley <mabentley85@gmail.com>
Date: Fri, 29 May 2020 10:11:25 -0700
Subject: [PATCH 7/8] altered white space

---
 src/components/Pagination/Pagination.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Pagination/Pagination.svelte b/src/components/Pagination/Pagination.svelte
index 41c9fa19..e9243d9e 100644
--- a/src/components/Pagination/Pagination.svelte
+++ b/src/components/Pagination/Pagination.svelte
@@ -28,7 +28,7 @@
 
   afterUpdate(() => {
     dispatch('update', {pageSize, page});
-	});
+  });
 
   $: totalPages = Math.max(Math.ceil(totalItems / pageSize), 1);
   $: selectItems = fillArray(totalPages);

From eaeb303c7211d531d8761f8f474cf3763100a029 Mon Sep 17 00:00:00 2001
From: Matthew Bentley <mabentley85@gmail.com>
Date: Fri, 29 May 2020 17:00:44 -0700
Subject: [PATCH 8/8] Ensure that Page Size and Page are always integers

---
 src/components/Pagination/Pagination.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Pagination/Pagination.svelte b/src/components/Pagination/Pagination.svelte
index e9243d9e..6d76340e 100644
--- a/src/components/Pagination/Pagination.svelte
+++ b/src/components/Pagination/Pagination.svelte
@@ -27,7 +27,7 @@
   const dispatch = createEventDispatcher();
 
   afterUpdate(() => {
-    dispatch('update', {pageSize, page});
+    dispatch('update', {pageSize: parseInt(pageSize), page: parseInt(page)});
   });
 
   $: totalPages = Math.max(Math.ceil(totalItems / pageSize), 1);