bug fix no-types#53

lelouch77 · Nov 3, 2019 · 677b31a · 677b31a
1 parent 220d308
commit 677b31a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/inst/htmlwidgets/lib/css/style.css b/inst/htmlwidgets/lib/css/style.css
@@ -9,6 +9,7 @@
 }
 .command-container {
   display: flex;
+  justify-content: flex-end;
   align-items: center;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
     Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
@@ -198,7 +199,7 @@
   min-width: 24px;
 }
 .command-container > div {
-  padding-left: 10px;
+  padding: 0px 10px;
 }
 .remove-icon {
   padding-top: 6px;

diff --git a/javascript/AgGridUtil.js b/javascript/AgGridUtil.js
@@ -59,27 +59,29 @@ export class AgGridUtil{
     static getColDef({data,isNumeric,sparkLineOptions,licenseKey,colOpts,formattingOptions,rowHeaders}){
         const columnHeaders = Object.keys(data);
 
-        let colDef = columnHeaders.map((columnHeader) => {
+        const colDef = columnHeaders.map((columnHeader) => {
             const isColNumeric = isNumeric[columnHeader];
-            let options = {
+            const options = {
                 headerName: columnHeader,
                 field: AgGridUtil.escape(columnHeader),
                 enableValue: isColNumeric,
                 filter : isColNumeric ? "agNumberColumnFilter" : "agTextColumnFilter"
             };
-            let sparkLineColDefOptions = SparkLineUtils.getSparkLineColDefOptions(sparkLineOptions,columnHeader);
-            let numericOptions = AgGridUtil.getNumericOptions(isColNumeric,formattingOptions[columnHeader]);
-            let userOptions = colOpts[columnHeader] || {};
-            let enterpriseColDefOptions = AgGridUtil.getEnterpriseColDefOptions(isColNumeric,licenseKey);
+            const sparkLineColDefOptions = SparkLineUtils.getSparkLineColDefOptions(sparkLineOptions,columnHeader);
+            const numericOptions = AgGridUtil.getNumericOptions(isColNumeric,formattingOptions[columnHeader]);
+            const userOptions = colOpts[columnHeader] || {};
+            const enterpriseColDefOptions = AgGridUtil.getEnterpriseColDefOptions(isColNumeric,licenseKey);
             return Object.assign(options, enterpriseColDefOptions,sparkLineColDefOptions,numericOptions,userOptions);
         });
 
         if(rowHeaders){
+            const userOptions = colOpts["rowHeader"];
             colDef.unshift({
                 field : "rowHeaders",
                 headerName : "", 
                 enablePivot : licenseKey ? false : undefined,
                 enableRowGroup  : licenseKey ? false : undefined,
+                ...userOptions
             });
         }