Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add Chart2Music keyboard and sound accessibility features #6680

Open
wants to merge 81 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 70 commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
6fb9c65
initial commit, single scatter plot
Jul 21, 2023
87b4c5c
single scatter plot
Jul 21, 2023
64ae505
options and info
Jul 21, 2023
d37d24f
data and trace labels
Jul 21, 2023
d0467bb
false default
Jul 21, 2023
3a73776
remove debugging prints
Jul 21, 2023
b4df959
use index if no x provided
Jul 21, 2023
97b608f
Lib requirement
Jul 22, 2023
6205d62
layout destructuring
Jul 22, 2023
7e40cde
layout defaults
Jul 22, 2023
6d9185b
destructure trace
Jul 22, 2023
935cf54
test sourcetype module
Jul 22, 2023
44deae2
remove sourcetype
Jul 22, 2023
c38ab67
into es5
Jul 28, 2023
c6a27be
include mjs files
Jul 28, 2023
cac174c
transpile accessibility
Jul 30, 2023
159ca1b
accessibility in config
Jul 30, 2023
7467a47
Merge branch 'master' into chart2music
ayjayt Jan 12, 2024
08b820b
Remove special rules from webpack.config:
ayjayt Jan 12, 2024
41b0fb9
Reorder declarations to make a bit more readable
ayjayt Jan 12, 2024
94e25c3
Lint
ayjayt Jan 13, 2024
61ea8ce
Change import/export scheme to promise
ayjayt Jan 17, 2024
c9a0b91
Remove a console.log
ayjayt Jan 17, 2024
cc92639
Limit chunks to 1
ayjayt Jan 17, 2024
7baa0d3
Upgrade chart2music to support commonjs
ayjayt Jan 17, 2024
3127dee
Rewrite accessibility in es5
ayjayt Jan 17, 2024
2429e55
Merge pull request #1 from geopozo/pikul-music-import-promise
aliwelchoo Jan 17, 2024
00572e8
Fix some undef errors in accessibility
ayjayt Jan 17, 2024
30f4e11
update plot-schema diff
ayjayt Jan 17, 2024
247b301
Merge branch 'master' into pikul-music-import-promise
ayjayt Jan 25, 2024
d08adfb
Add config so dev can place closed captions:
ayjayt Jan 25, 2024
dbce5da
Merge branch 'chart2music' of https://github.com/aliwelchoo/plotly.js…
ayjayt Jan 25, 2024
e1f9563
Add more default assurance in accessibility
ayjayt Jan 25, 2024
3f4ab54
Lint
ayjayt Jan 25, 2024
92d97b7
Skip empty trace data in accessibility.enable:
ayjayt Jan 25, 2024
6b2dcc9
update plot-schema diff
ayjayt Jan 25, 2024
b5bb517
Modify how accessibility treats config vars:
ayjayt Jan 26, 2024
25ca44a
Remove jasmine ftest focus
ayjayt Jan 26, 2024
7328324
Run schema plot diff
ayjayt Jan 26, 2024
00b2750
Test if previous commits deprecate hack-fix
ayjayt Jan 26, 2024
b04bb17
Set c2music default to not make its caption div:
ayjayt Jan 26, 2024
d4bd71b
update plot-scheme diff
ayjayt Jan 26, 2024
af2ff80
Add closed captions to dev dashboard
ayjayt Jan 26, 2024
80b4cf3
Merge pull request #2 from geopozo/pikul-music-import-promise
aliwelchoo Jan 28, 2024
ee99f35
Merge branch 'master' into chart2music
ayjayt Jan 29, 2024
3841640
Merge branch 'master' into chart2music
ayjayt Feb 9, 2024
d84d108
Merge branch 'master' into chart2music
ayjayt Feb 28, 2024
0c43407
Refactor accessibility/c2m:
ayjayt Feb 28, 2024
4c75035
Lint
ayjayt Feb 28, 2024
3c49ed6
Fix import path
ayjayt Feb 28, 2024
f7be666
Merge remote-tracking branch 'origin/build-with-esbuild' into chart2m…
archmoj Feb 28, 2024
4a260af
Merge branch 'master' into chart2music
ayjayt Mar 10, 2024
f67c513
Merge branch 'master' into chart2music
ayjayt Mar 20, 2024
41baab9
Merge branch 'master' into chart2music
ayjayt Mar 27, 2024
26754b7
Merge with master
marthacryan Sep 16, 2024
ed18907
Change name of config to sonification, clean up directory
marthacryan Sep 23, 2024
1e4bcef
Spelling
marthacryan Sep 23, 2024
2c1abf4
fix directory name
marthacryan Sep 23, 2024
614fb8b
Reset package-lock
marthacryan Sep 23, 2024
5f5e599
Update package-lock.json
marthacryan Sep 23, 2024
fe9736e
Reset tests
marthacryan Sep 23, 2024
59ad5c6
Update auto-generated schema
marthacryan Sep 23, 2024
d18c584
Rename more stuff to sonification and clean up contributing
marthacryan Sep 24, 2024
043d408
Update filepath for new location of enable_sonification.js
marthacryan Sep 24, 2024
129eb3b
Code readability improvements
marthacryan Sep 24, 2024
acc8517
Add baseline for new mock
marthacryan Sep 24, 2024
c5ad240
Remove changes in existing mock
marthacryan Sep 24, 2024
0113d90
Update baseline
marthacryan Sep 24, 2024
771029e
Remove function that was introduced through incorrect merge
marthacryan Sep 24, 2024
bfbbbf1
Undo changes to jasmine tests
marthacryan Sep 25, 2024
cadfd7f
Revert "Code readability improvements"
marthacryan Sep 25, 2024
56e582d
Fix syntax
marthacryan Sep 25, 2024
8e55f98
remove comment
marthacryan Sep 25, 2024
86d75d8
Remove todo
marthacryan Sep 25, 2024
15671b0
Schema update
marthacryan Oct 1, 2024
057e067
Merge branch 'master' of github.com:plotly/plotly.js into chart2music
marthacryan Oct 1, 2024
44f7ad3
Remove accessibility wrapper directory
marthacryan Oct 1, 2024
8e3b62b
Fix filepaths
marthacryan Oct 1, 2024
aed1e02
Code cleanup
marthacryan Oct 1, 2024
1777fba
Code cleanup
marthacryan Oct 1, 2024
3a0384f
Code cleanup
marthacryan Oct 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,9 @@ npm run baseline mock_*
```

**IMPORTANT:** the `baseline`, `test-image` and `test-export` scripts do **not** bundle the source files before
running the image tests. We recommend running `npm run watch` or `npm start` in
running the image tests. We recommend running `npm start` in
a separate tab to ensure that the most up-to-date code is used.
Also if you are adding a new mock, you may need to re-run `npm start` or `npm run watch`
Also if you are adding a new mock, you may need to re-run `npm start`
to be able to find the new mock in the browser.
To help ensure valid attributes are used in your new mock(s), please run `npm run test-mock`
or `npm run test-mock mock_name(s)` after adding new mocks or implementing any new attributes.
Expand Down
108 changes: 107 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
"@turf/centroid": "^7.1.0",
"base64-arraybuffer": "^1.0.2",
"canvas-fit": "^1.5.0",
"chart2music": "^1.13.0",
"color-alpha": "1.0.4",
"color-normalize": "1.5.0",
"color-parse": "2.0.0",
Expand Down
3 changes: 3 additions & 0 deletions src/accessibility/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# accessibility

While anticipating more accessibility libraries in the future, as of today this is a trivial wrapper over the `sonification` directory.
33 changes: 33 additions & 0 deletions src/accessibility/sonification/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# `plotly.js` wrapper for `chart2music`, sonified charts

This wrapper attaches a context object to `gd._context._c2m` with the following properties:

* `.options`: the options object as required by c2m
* `.info`: the info object as required by c2m
* `.ccOptions`: information about where to place the closed caption div
* `.c2mHandler`: the object returned by calling the c2m library's initializer

The first three have most of their values set by the defaults in *src/plot_api/plot_config.js*.


### index.js

**index.js** exposes the following api:

* `initC2M(gd, defaultConfig)` full resets the `c2mChart` object.
* `defaultConfig` is equal to `gd._context.sonification`, as defined in *src/plot_api/plot_config.js*.


* `initClosedCaptionDiv(gd, config)` finds or creates the closed caption div, depending on `config`.
* `config` is equal to `defaultConfig.closedCaptions`.

### all_codecs.js
**all_codecs.js** agregates all the individual **_codec.js* files, all are expect to export exactly two functions: `test` and `process`.

I chose to aggregate all codecs in a separate file because it will ultimately be a 1-1 conversion if `plotly.js` adopts ES modules.

## Writing a Codec

This section is TODO

chart2music supports N types of graphs. We should figure out how how to convert as many plotly types to chart2music types. I will write descriptions for each type in the folder, if not the actual code, along with what `test` must return and what `process` must return.
5 changes: 5 additions & 0 deletions src/accessibility/sonification/all_codecs.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

var scatterXY = require('./xy_scatter_codec');

exports.codecs = [ scatterXY ];
10 changes: 10 additions & 0 deletions src/accessibility/sonification/enable_sonification.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
'use strict';

var c2mPlotly = require('.');

function enable_sonification(gd) {
// Collecting defaults
var defaultConfig = gd._context.sonification;
c2mPlotly.initC2M(gd, defaultConfig);
}
exports.enable_sonification = enable_sonification;
104 changes: 104 additions & 0 deletions src/accessibility/sonification/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
'use strict';

var c2m = require('chart2music');
var Fx = require('../../components/fx');
var Lib = require('../../lib');

var codecs = require('./all_codecs').codecs;

function initC2M(gd, defaultConfig) {
// TODO: should this be Lib.getGraphDiv()?
marthacryan marked this conversation as resolved.
Show resolved Hide resolved
// TODO what is there besides a fullReset?
Copy link
Contributor

@marthacryan marthacryan Sep 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate on this? @ayjayt

// TODO Do we need the capacity to add data (live listen?)
// TODO Do we need the capacity to reset all data
var c2mContext = gd._context._c2m = {};
c2mContext.options = Lib.extendDeepAll({}, defaultConfig.options);
c2mContext.info = Lib.extendDeepAll({}, defaultConfig.info);
c2mContext.ccOptions = Lib.extendDeepAll({}, defaultConfig.closedCaptions);

var labels = []; // TODO this probably needs to be stored in context-
// when data is updated this specific instance needs to be updated
// or the below function eneds to be reset to use the new instance of labels.
c2mContext.options.onFocusCallback = function(dataInfo) {
Fx.hover(gd, [{
curveNumber: labels.indexOf(dataInfo.slice),
pointNumber: dataInfo.index
}]);
};
// I generally don't like using closures like this.
// In this case it works out, we effectively treat 'labels'
// like a global, but it's a local.
// I'd rather the callback be given its c2m handler which
// could store extra data. Or bind c2mContext as `this`.

var titleText = gd._fullLayout.title?.text ?? 'Chart';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering if we could/should use other default e.g. Plotly chart or something else?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ndrezn Thoughts?

var ccElement = initClosedCaptionDiv(gd, c2mContext.ccOptions);

// TODO:
// I believe that title OR title.text could contain the information needed
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@archmoj Is that accurate that title or title.text could contain the information needed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The preferred way of setting a title is via title.text not title.
Setting title to a string is discouraged(& deprecated) but may still widely used in our codes.
We may handle case of title in case title is set to a string instead of an object.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should drop support for that!

// So we should stop if title is a type string
// Furthermore, I think that the traces would have to point to their axis,
// since it might not be x1, could be x2, etc
// So this really needs to be part of process()
var xAxisText = gd._fullLayout.xaxis?.title?.text ?? 'X Axis';
var yAxisText = gd._fullLayout.yaxis?.title?.text ?? 'Y Axis';

var c2mData = {};
var types = [];
var fullData = gd._fullData;
// TODO: We're looping through all traces, and that's fine, but it might be helpful to discern how things are organized
for(var i = 0; i < fullData.length; i++) {
var trace = fullData[i];
// TODO: what happens if this doesn't run, weird c2m errors
for(var codecI = 0; codecI < codecs.length; codecI++) {
var test = codecs[codecI].test(trace);
if (!test) continue;
var label = test.name ? test.name : i.toString() + ' ';

var labelCount = 0;
var originalLabel = label;
while (label in c2mData) {
labelCount++;
label = originalLabel + labelCount.toString();
}

labels.push(label);
types.push(test.type);
c2mData[label] = codecs[codecI].process(trace);
}
} // TODO add unsupported codec

c2mContext.c2mHandler = c2m.c2mChart({
title: titleText,
type: types,
axes: {
x: { // needs to be generated
label: xAxisText
},
y: {
label: yAxisText
},
},
element: gd,
cc: ccElement,
data: c2mData,
options: c2mContext.options,
info: c2mContext.info
});
// TODO: We need to handle the possible error that c2mChart returns
}
exports.initC2M = initC2M;

function initClosedCaptionDiv(gd, config) {
if(config.generate) {
var closedCaptions = document.createElement('div');
closedCaptions.id = config.elId;
closedCaptions.className = config.elClassname;
gd.parentNode.insertBefore(closedCaptions, gd.nextSibling); // this really might not work
return closedCaptions;
} else {
return document.getElementById(config.elId);
}
}

exports.initClosedCaptionDiv = initClosedCaptionDiv;
27 changes: 27 additions & 0 deletions src/accessibility/sonification/xy_scatter_codec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
'use strict';
// This codec serves for one x axis and one y axis

function test(trace) {
if(!trace) return null;
if(!trace.type || trace.type !== 'scatter') return null;
// TODO: I think we can have an x OR a y
if((trace.y === undefined || trace.y.length === 0) && (trace.x === undefined || trace.x.length === 0)) return null;
return {type: 'scatter', name: trace.name};
}
exports.test = test;

function process(trace) {
var traceData = [];
var x = trace.x && trace.x.length !== 0 ? trace.x : [];
var y = trace.y && trace.y.length !== 0 ? trace.y : [];

for(var p = 0; p < Math.max(x.length, y.length); p++) {
traceData.push({ // TODO I think we're copying the data here, bad.
x: x[p] ? x[p] : p,
y: y[p] ? y[p] : p,
label: trace.text[p] ? trace.text[p] : p
});
}
return traceData;
}
exports.process = process;
Loading