Merge branch 'testing'

* testing: updated changelog and readme files for new release updates for strike version 0.10.1 Adding fix for datagrid so that a single COMPONENT column doesnt throw an error
appiphony · Nov 28, 2017 · 9a86b7c · 9a86b7c
2 parents f6c165d + 8d4972f
commit 9a86b7c
Show file tree

Hide file tree

Showing 106 changed files with 279 additions and 213 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Strike by Appiphony
 
+###Release 0.10.1 — November 28, 2017
+####Improvements
+* **Strike Data Grid:** Added `loadMore` functionality to control how many rows are displayed and how many render when `loadMore` button is pressed <a href="https://github.com/appiphony/Strike-Components/issues/135" target="_blank">[GitHub Issue #135]</a>
+#### Bug Fixes
+* **Strike Datepicker:** Fixed an issue where clicking into a datepicker input with a value does not open the datepicker <a href="https://github.com/appiphony/Strike-Components/issues/119" target="_blank">[GitHub Issue #119]</a>
+* **Strike Modal:** Closing the modal with 'Esc' key will now fire a close event <a href="https://github.com/appiphony/Strike-Components/issues/125" target="_blank">[GitHub Issue #125]</a>
+* **Strike Modal:** Fixed an issue where pressing the 'Esc' key does not close a modal if it was opened through modifying the `showModal` attribute <a href="https://github.com/appiphony/Strike-Components/issues/126" target="_blank">[GitHub Issue #126]</a>
+* **Strike Multi Select Picklist:** Fixed an issue where selections are removable even if the picklist is disabled <a href="https://github.com/appiphony/Strike-Components/issues/132" target="_blank">[GitHub Issue #132]</a>
+* **Strike Datepicker:** Fixed issue where two datepickers on one page wouldn't close eachother when one was selected and the other was open <a href="https://github.com/appiphony/Strike-Components/issues/134" target="_blank">[GitHub Issue #134]</a>
+* **Strike Chart:** Fixed issue with the chart rendering without a background <a href="https://github.com/appiphony/Strike-Components/issues/133" target="_blank">[GitHub Issue #133]</a>
+* **Strike Select:** Fixed an issue where dropdowns are not opening if `searchable` is set to `true` <a href="https://github.com/appiphony/Strike-Components/issues/122" target="_blank"> [GitHub Issue #122]</a>
+* **Strike Select:** Fixed an issue where the component appears in Lightning Page Builder <a href="https://github.com/appiphony/Strike-Components/issues/124" target="_blank">[GitHub Issue #124]</a>
+* **Strike Input:** Fixed an issue where required validation was happening on change and not blur <a href="https://github.com/appiphony/Strike-Components/issues/145" target="_blank">[GitHub Issue #145]</a>
+* **Strike Datepicker:** Fixed an issue where datepicker was rendering with a transparent background <a href="https://github.com/appiphony/Strike-Components/issues/148" target="_blank">[GitHub Issue #148]</a>
+* **Strike Multi Select Picklist:** Fixed an issue where options were rendering incorrectly when in an error state <a href="https://github.com/appiphony/Strike-Components/issues/150" target="_blank">[GitHub Issue #150]</a>
+
+---
+
 ### Release 0.10.0 — November 1, 2017
 #### Improvements
 * **All Strike Components:** Updated API versions to 41

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Strike by Appiphony
 ### Work smarter (not harder) with Salesforce Lightning Components
-Current release: 0.10.0  
+Current release: 0.10.1  
 See it in action here: <a href="http://www.lightningstrike.io" target="_blank">http://www.lightningstrike.io</a>
 
 ---

diff --git a/aura/defaultTokens/defaultTokens.tokens b/aura/defaultTokens/defaultTokens.tokens
@@ -1,7 +1,7 @@
 <!--
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_badge/strike_badge.cmp b/aura/strike_badge/strike_badge.cmp
@@ -1,7 +1,7 @@
 <!--
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_badge/strike_badgeController.js b/aura/strike_badge/strike_badgeController.js
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_carousel/strike_carousel.cmp b/aura/strike_carousel/strike_carousel.cmp
@@ -1,7 +1,7 @@
 <!--
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_carousel/strike_carousel.css b/aura/strike_carousel/strike_carousel.css
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_carousel/strike_carouselController.js b/aura/strike_carousel/strike_carouselController.js
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_carousel/strike_carouselHelper.js b/aura/strike_carousel/strike_carouselHelper.js
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_carousel/strike_carouselRenderer.js b/aura/strike_carousel/strike_carouselRenderer.js
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_carouselCard/strike_carouselCard.cmp b/aura/strike_carouselCard/strike_carouselCard.cmp
@@ -1,7 +1,7 @@
 <!--
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_carouselCard/strike_carouselCard.css b/aura/strike_carouselCard/strike_carouselCard.css
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_chart/strike_chart.cmp b/aura/strike_chart/strike_chart.cmp
@@ -1,12 +1,12 @@
 <!--
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License
 -->
-<aura:component implements="force:appHostable,flexipage:availableForAllPageTypes" access="global">
+<aura:component>
     <ltng:require scripts="/resource/d3" afterScriptsLoaded="{!c.onInit}"/>
     <aura:attribute name="scriptsLoaded" type="Boolean" default="{!false}"/>
 
@@ -75,7 +75,7 @@ License: BSD 3-Clause License
     <aura:handler name="change" value="{!v.medLabel}" action="{!c.reRenderCharts}"/>
     <aura:handler name="change" value="{!v.highLabel}" action="{!c.reRenderCharts}"/>
 
-    <div class="slds-box">
+    <div class="slds-card slds-p-around_small">
         <div aura:id="chartContainer" class="sc-position--relative">
             <div aura:id="tooltipContainer" style="{!'display: ' + v.tooltipDisplay + '; position: absolute; top: ' + v.tooltipYPos + 'px; left: ' + v.tooltipXPos + 'px;'}" class="sc-tooltip">
                 <div class="label">

diff --git a/aura/strike_chart/strike_chart.css b/aura/strike_chart/strike_chart.css
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_chart/strike_chartController.js b/aura/strike_chart/strike_chartController.js
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_chart/strike_chartHelper.js b/aura/strike_chart/strike_chartHelper.js
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_chart/strike_chartRenderer.js b/aura/strike_chart/strike_chartRenderer.js
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_dataGrid/strike_dataGrid.cmp b/aura/strike_dataGrid/strike_dataGrid.cmp
@@ -1,7 +1,7 @@
 <!--
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License
@@ -14,6 +14,7 @@ License: BSD 3-Clause License
     <aura:handler name="change" value="{!v.data}" action="{!c.handleDataChange}"/>
     <aura:attribute name="fixed" type="Boolean" description="determines if fixed layout class gets added to table" default="{!false}"/>
     <aura:attribute name="responsive" type="Boolean" description="determines if table is responsive/mobile-friendly" default="{!false}"/>
+    <aura:attribute name="scrollable" type="Boolean" description="determines whether the table will be horizontally scrollable" default="{!false}"/>
     <aura:attribute name="class" type="String" description="classlist that can be added to the table"/>
     <aura:attribute name="loadMoreAmount" type="Integer" default="10"/>
     <!-- /External -->
@@ -24,51 +25,58 @@ License: BSD 3-Clause License
 	<aura:attribute name="currentSortColumn" type="String" description="name of column that was last used for sorting" access="private"/>
 	<aura:attribute name="ascending" type="Boolean" description="value that determines which way grid data is sorted" access="private"/>
     <aura:dependency resource="strike_row"/>
-    <aura:attribute name="showLoadMore" type="Boolean" default="{!true}" access="public"/>
+    <aura:attribute name="showLoadMore" type="Boolean" default="{!true}" access="private"/>
     <aura:method name="loadMore" action="{!c.loadMore}" access="public" />
     <!-- /Internal -->
 
 
     <aura:if isTrue="{!v.showTable}">
-        <table class="{!'slds-table slds-table--bordered slds-table--cell-buffer ' + if(v.responsive, 'slds-max-medium-table--stacked ') + if(v.fixed, 'slds-table--fixed-layout ', 'slds-table--resizable-cols ') + v.class}">
-            <thead>
-                <tr class="slds-text-title--caps">
-                    <aura:iteration items="{!v.formattedData.columns}" var="column">
-                        <aura:if isTrue="{!column.sortable}">
-                            <th class="{!'slds-is-sortable' + if(and(v.currentSortColumn == column.name, v.ascending), ' slds-is-sorted slds-is-sorted--asc') + if(and(v.currentSortColumn == column.name, !v.ascending), ' slds-is-sorted slds-is-sorted--desc')}" onclick="{!c.handleColumnHeaderClick}" data-column-name="{!column.name}" scope="col">
-                                <a class="slds-th__action slds-text-link--reset" tabindex="0">
-                                    <span class="slds-assistive-text">Sort</span>
-                                    <span class="slds-truncate" title="{!column.name}">{!column.label}</span>
-                                    <div class="slds-icon_container">
-                                        <aura:if isTrue="{!column.name == v.currentSortColumn}">
-                                            <span>
-                                                <aura:if isTrue="{!v.ascending}">
-                                                    <lightning:icon iconName="utility:arrowup" size="x-small" class="sdg-sort-icon"/>
-                                                        <aura:set attribute="else">
-                                                            <lightning:icon iconName="utility:arrowdown" size="x-small" class="sdg-sort-icon"/>
-                                                        </aura:set>
-                                                </aura:if>
-                                            </span>
-                                            <aura:set attribute="else">
-                                                <lightning:icon iconName="utility:arrowup" size="x-small" class="sdg-sort-icon" />
-                                            </aura:set>
-                                        </aura:if>
-                                    </div>
-                                </a>
-                            </th>
-                            <aura:set attribute="else">
-                                <th data-column-name="{!column.name}" scope="col">
-                                    <div class="slds-truncate" title="{!column.name}">{!column.label}</div>
+        <div class="{!if(v.scrollable, 'slds-scrollable_x', '')}">
+            <table class="{!'slds-table slds-table--bordered slds-table--cell-buffer ' + if(v.responsive, 'slds-max-medium-table--stacked ', '') + if(v.fixed, 'slds-table--fixed-layout ', 'slds-table--resizable-cols ') + v.class}">
+                <thead>
+                    <tr class="slds-text-title--caps">
+                        <aura:iteration items="{!v.formattedData.columns}" var="column">
+                            <aura:if isTrue="{!column.sortable}">
+                                <th class="{!'slds-is-sortable' + if(and(v.currentSortColumn == column.name, v.ascending), ' slds-is-sorted slds-is-sorted--asc', '') + if(and(v.currentSortColumn == column.name, !v.ascending), ' slds-is-sorted slds-is-sorted--desc', '')}" onclick="{!c.handleColumnHeaderClick}" data-column-name="{!column.name}" scope="col">
+                                    <a class="slds-th__action slds-text-link--reset" tabindex="0">
+                                        <span class="slds-assistive-text">Sort</span>
+                                        <span class="slds-truncate" title="{!column.name}">{!column.label}</span>
+                                        <div class="slds-icon_container">
+                                            <aura:if isTrue="{!column.name == v.currentSortColumn}">
+                                                <span>
+                                                    <aura:if isTrue="{!v.ascending}">
+                                                        <lightning:icon iconName="utility:arrowup" size="x-small" class="sdg-sort-icon"/>
+                                                            <aura:set attribute="else">
+                                                                <lightning:icon iconName="utility:arrowdown" size="x-small" class="sdg-sort-icon"/>
+                                                            </aura:set>
+                                                    </aura:if>
+                                                </span>
+                                                <aura:set attribute="else">
+                                                    <lightning:icon iconName="utility:arrowup" size="x-small" class="sdg-sort-icon" />
+                                                </aura:set>
+                                            </aura:if>
+                                        </div>
+                                    </a>
                                 </th>
-                            </aura:set>
-                        </aura:if>
-                    </aura:iteration>
-                </tr>
-            </thead>
-            <tbody>
-                {!v.body}
-            </tbody>
-        </table>
+                                <aura:set attribute="else">
+                                    <th data-column-name="{!column.name}" scope="col">
+                                        <div class="slds-truncate" title="{!column.name}">{!column.label}</div>
+                                    </th>
+                                </aura:set>
+                            </aura:if>
+                        </aura:iteration>         
+                    </tr>
+                </thead>
+                <tbody>
+                    {!v.body}
+                </tbody>
+            </table>
+        </div>
+        <aura:if isTrue="{!v.showLoadMore}">
+            <div class="slds-text-align_right slds-m-top_medium">
+                <lightning:button label="LoadMore" title="LoadMore" iconName="utility:add" onclick="{!c.loadMore}" />
+            </div>
+        </aura:if> 
     </aura:if>
 </aura:component>
 <!--

diff --git a/aura/strike_dataGrid/strike_dataGrid.css b/aura/strike_dataGrid/strike_dataGrid.css
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License
@@ -21,15 +21,15 @@ License: BSD 3-Clause License
     min-width: t(spacingMedium);
 }
 
-.THIS.slds-table.slds-table--cell-buffer thead th:not(.slds-is-sortable) {
+.THIS .slds-table.slds-table--cell-buffer thead th:not(.slds-is-sortable) {
     padding: t(spacingXSmall);
 }
 
-.THIS.slds-table.slds-table--cell-buffer tr>th:first-child {
+.THIS .slds-table.slds-table--cell-buffer tr>th:first-child {
     padding-left: t(spacingLarge);
 }
 
-.THIS.slds-table.slds-table--cell-buffer tr>th.slds-is-sortable:first-child {
+.THIS .slds-table.slds-table--cell-buffer tr>th.slds-is-sortable:first-child {
     padding-left: t(spacingMedium);
 }
 /*

diff --git a/aura/strike_dataGrid/strike_dataGridController.js b/aura/strike_dataGrid/strike_dataGridController.js
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License

diff --git a/aura/strike_dataGrid/strike_dataGridHelper.js b/aura/strike_dataGrid/strike_dataGridHelper.js
@@ -1,7 +1,7 @@
 /*
 Strike by Appiphony
 
-Version: 0.10.0
+Version: 0.10.1
 Website: http://www.lightningstrike.io
 GitHub: https://github.com/appiphony/Strike-Components
 License: BSD 3-Clause License
@@ -90,10 +90,11 @@ License: BSD 3-Clause License
 			formattedData.rows = formattedRows;
 			formattedData.columns = columns;
 			component.set('v.formattedData', formattedData);
-			helper.createRowComponents(component, event, helper);
+			component.set('v.showLoadMore', component.get('v.loadMoreAmount') < formattedRows.length);
+			helper.createRowComponents(component, event, helper, false);
 		}
 	},
-	createRowComponents: function(component,event,helper) {
+	createRowComponents: function(component, event, helper, isLoadMore) {
 		var howManyToLoad = component.get('v.loadMoreAmount'); //let this be a design attribute
 		var formattedData = component.get('v.formattedData');
 
@@ -111,6 +112,11 @@ License: BSD 3-Clause License
 			component.set('v.showLoadMore', false);
 		}
 
+		if(!isLoadMore) {
+			rowsToCreate = howManyToLoad;
+			component.set('v.showLoadMore', true);
+		}
+
 		var createRowCallback = function(newCmp, status, errorMessage){
 			if(status === 'SUCCESS'){
 				body.push(newCmp);
@@ -195,8 +201,7 @@ License: BSD 3-Clause License
 		component.set('v.currentSortColumn', selectedColumnName);
 	},
 	loadMore: function(component, event, helper) {
-		var formattedData = component.get('v.formattedData');
-		helper.createRowComponents(component, event, helper);
+		helper.createRowComponents(component, event, helper, true);
 	}
 })
 /*