Merge branch 'develop'

silevis · Oct 29, 2024 · cc26fa4 · cc26fa4
2 parents 2c4e6f6 + 84537b2
commit cc26fa4
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -1,13 +1,11 @@
-# ReactGrid - Spreadsheet experience for your React app
+<img alt="Sample app" src="public/rg-banner.png"/>
 
 <div align="center">
 
 ReactGrid is an open-source React component for displaying and editing data in a spreadsheet-like way. 🚀
 
 [![MIT license](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/silevis/reactgrid/blob/develop/LICENSE)
-[![Build Status](https://dev.azure.com/Silevis/ReactGrid/_apis/build/status/GitHub-MIT/Upgrade%20version%20and%20publish?branchName=master)](https://dev.azure.com/Silevis/ReactGrid/_build/latest?definitionId=17&branchName=master)
 [![reactgrid](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/hwrqiy&style=flat&logo=cypress)](https://dashboard.cypress.io/projects/hwrqiy/runs)
-[![npm version](https://badge.fury.io/js/%40silevis%2Freactgrid.svg)](https://badge.fury.io/js/%40silevis%2Freactgrid)
 
 <img alt="Sample app" src="https://reactgrid.com/sample.gif"/>
 
@@ -17,39 +15,31 @@ If you like our work, please give this project a star ⭐
 </div>
 &nbsp;
 
-Prerequisites:
+# Check out the new v5-alpha version
 
-- react:  `16.13.1` || `17.0.0` `18.2.0`
-- react-dom: `16.13.1` || `17.0.0` || `18.2.0`
+🌐 [Visit our new Website](https://silevis.github.io/reactgrid/)
 
+📚 [Dive into the Documentation](https://silevis.github.io/reactgrid/docs/5.0/1-getting-started) to get started quickly and easily.
 
+# Features
 
-
-
-# Docs
-
-- [Demo](https://reactgrid.com/examples/?utm_source=github&utm_medium=readme)
-- [Get started](https://reactgrid.com/docs/4.0/1-getting-started/?utm_source=github&utm_medium=readme)
-- [Documentation](https://reactgrid.com/docs/4.0/0-introduction/?utm_source=github&utm_medium=readme)
-- [API Reference](https://reactgrid.com/docs/4.0/7-api/?utm_source=github&utm_medium=readme)
-
-# Browser support
-
-| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="Edge"  />](http://godban.github.io/browsers-support-badges/)<br> Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox"  />](http://godban.github.io/browsers-support-badges/)<br> Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome"  />](http://godban.github.io/browsers-support-badges/)<br> Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" />](http://godban.github.io/browsers-support-badges/)<br> Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari-ios/safari-ios_48x48.png" alt="iOS Safari" />](http://godban.github.io/browsers-support-badges/) <br>iOS/iPadOs Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/samsung-internet/samsung-internet_48x48.png" alt="Samsung"/>](http://godban.github.io/browsers-support-badges/)<br> Samsung internet | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" />](http://godban.github.io/browsers-support-badges/)<br> Opera |
-| :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
-|                                                                                     80+                                                                                     |                                                                                           61+                                                                                           |                                                                                         57+                                                                                         |                                                                                       13.1+                                                                                        |                                                                                                    13+                                                                                                    |                                                                                                        9+                                                                                                        |                                                                                      45+                                                                                       |
+- Handling data changes
+- Column resizing
+- Column and row reordering
+- Sticky rows and columns
+- Keyboard shortcuts
+- Spanned cells
+- Range selection
+- Fill handle
+- Styled ranges
+- Custom styling
+- Custom cell types
+- Customizable behaviors
+- API hook that allows you to interact with a ReactGrid
 
 # Licensing
 
-ReactGrid is published under the MIT License (MIT).
-
-(c) 2024 Silevis Software Sp. z o.o.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ReactGrid is published under the [MIT License](./LICENSE).
 
 # Authors
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@silevis/reactgrid",
   "description": "Add spreadsheet-like behavior to your React app.",
-  "version": "4.1.10",
+  "version": "4.1.11",
   "homepage": "https://reactgrid.com",
   "license": "MIT",
   "author": "Silevis Software",

diff --git a/public/rg-banner.png b/public/rg-banner.png
diff --git a/src/default-colors.scss b/src/default-colors.scss
@@ -1,3 +1,5 @@
+@use "sass:color";
+
 // COLORS
 $primary-color: #3579f8 !default;
 $bg-color: #ffffff !default;
@@ -19,10 +21,7 @@ $checkbox-mark: #ffffff !default;
 $rg-content-text-color: #000000 !default;
 $cell-text-color: #000000 !default;
 
-$dropdown-focused-item-bg-color: lighten(
-  $color: $primary-color,
-  $amount: 35,
-) !default;
+$dropdown-focused-item-bg-color: color.scale($primary-color, $lightness: 92.96875%) !default;
 $dropdown-menu-bg-color: #ffffff !default;
 
 // SHADOWS
@@ -41,4 +40,4 @@ $opacity-20: 0.2 !default;
 $opacity-15: 0.15 !default;
 $opacity-10: 0.1 !default;
 $opacity-06: 0.06 !default;
-$opacity-01: 0.01 !default;
+$opacity-01: 0.01 !default;
diff --git a/src/main.scss b/src/main.scss
@@ -1,3 +1,5 @@
+@use "sass:color";
+
 .rg-copy-container[contenteditable] {
     -webkit-user-select: text;
     user-select: text;
@@ -195,7 +197,7 @@
             cursor: pointer;
 
             &:hover {
-                background-color: darken($main-bg-color, 5);
+                background-color: color.scale($main-bg-color, $lightness: -5%);
             }
         }
     }