Skip to content

Commit 8dd4c4a

Browse files
committed
Merge branch 'refs/heads/main' into clarasb-101_select_component_add_multiple
# Conflicts: # chartlets.js/CHANGES.md # chartlets.py/CHANGES.md # chartlets.py/demo/my_extension/__init__.py # chartlets.py/demo/my_extension/my_panel_5.py
2 parents ec5c855 + 64990f7 commit 8dd4c4a

30 files changed

+1247
-169
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
[![CI](https://github.com/bcdev/chartlets/actions/workflows/backend-ci.yml/badge.svg)](https://github.com/bcdev/chartlets/actions/workflows/backend-ci.yml)
88
[![codecov](https://codecov.io/gh/bcdev/chartlets/graph/badge.svg?token=zJBPMFvnpg&flag=backend)](https://codecov.io/gh/bcdev/chartlets)
99
[![PyPI](https://img.shields.io/pypi/v/chartlets)](https://pypi.org/project/chartlets/)
10+
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/chartlets/badges/version.svg)](https://anaconda.org/conda-forge/chartlets)
1011

1112
Chartlets is a software framework that allows websites developed with
1213
React to be extended by server-side UI contributions programmed in Python

chartlets.js/CHANGES.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
## Version 0.1.4 (in development)
1+
## Version 0.1.5 (in development)
22

33
* Add `multiple` property for `Select` component to enable the selection
44
of multiple elements. The `default` mode is supported at the moment.
55

6+
7+
## Version 0.1.4 (from 2025/03/06)
8+
9+
* In `chartlets.js` we no longer emit warnings and errors in common
10+
situations to avoid too much spam in the browser console.
11+
12+
* New (MUI) components
13+
- `DataGrid`
14+
- `Dialog`
15+
- `Table`
16+
617
## Version 0.1.3 (from 2025/01/28)
718

819
* **Chore:** Version bump to align CI process with GitHub release flow.
@@ -148,5 +159,4 @@
148159

149160
## Version 0.0.16 (from 2024/11/12)
150161

151-
Initial, still experimental version.
152-
162+
Initial, still experimental version.

chartlets.js/package-lock.json

Lines changed: 129 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

chartlets.js/packages/lib/package.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "chartlets",
3-
"version": "0.1.3",
3+
"version": "0.1.4",
44
"description": "An experimental library for integrating interactive charts into existing JavaScript applications.",
55
"type": "module",
66
"files": [
@@ -59,13 +59,17 @@
5959
"zustand": "^5.0"
6060
},
6161
"peerDependencies": {
62-
"@mui/material": ">=6",
63-
"react": ">=18",
64-
"react-dom": ">=18",
62+
"@mui/material": "^6.2.1",
63+
"@mui/x-data-grid": ">=7",
64+
"react": "^18.3.1",
65+
"react-dom": "^18.3.1",
6566
"react-vega": ">=7",
6667
"vega-themes": ">=2"
6768
},
6869
"peerDependenciesMeta": {
70+
"@mui/x-data-grid": {
71+
"optional": true
72+
},
6973
"react": {
7074
"optional": false
7175
},
@@ -74,6 +78,7 @@
7478
}
7579
},
7680
"devDependencies": {
81+
"@mui/x-data-grid": "^7.23.5",
7782
"@testing-library/jest-dom": "^6.6.3",
7883
"@testing-library/react": "^16.1.0",
7984
"@types/node": "^20.11.17",

0 commit comments

Comments
 (0)