Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
824185c
Initial commit of merged branches and cleanup
gfodor May 18, 2018
e641db9
Timeline example working
gfodor May 18, 2018
5f0ab4b
Linting cleanup, added container decorator
gfodor May 18, 2018
0ae91ac
First attempt at react 16
gfodor May 19, 2018
d5c5e00
Canvas rendering
gfodor May 19, 2018
101c355
Gradient example working
gfodor May 19, 2018
0adc567
Text working
gfodor May 19, 2018
cc08821
Image WIP
gfodor May 19, 2018
5ed71c2
Image working
gfodor May 19, 2018
e845874
Cleanup
gfodor May 19, 2018
36dbeab
List view kinda working
gfodor May 19, 2018
166db2d
ListView working great
gfodor May 20, 2018
5650443
Properly clear on container unmount
gfodor May 20, 2018
f5175da
Properly destroy event handlers
gfodor May 20, 2018
541bec5
Custom drawing
gfodor May 20, 2018
5044564
Heatmap example working
gfodor May 20, 2018
6d8130e
Timeline example working
gfodor May 20, 2018
1563439
Fix arg issue with prop changes
gfodor May 20, 2018
0e9546a
Update README
gfodor May 20, 2018
d9a3805
Fix up package
gfodor May 20, 2018
8ae16d4
Move over CSS example
gfodor May 20, 2018
6d0fa61
Fixes for font layout
gfodor May 20, 2018
f0cb7c7
Component and layer pooling
gfodor May 21, 2018
dfa0b2f
Speed up and fix up caching to not allocate memory
gfodor May 21, 2018
471a818
Use NPM css-layout
gfodor May 21, 2018
e3f7ab6
Remove dead code and fix image background
gfodor May 21, 2018
55a3e8c
Allow setting of canvas
gfodor May 24, 2018
05b52ea
Don't render canvas if not needed
gfodor May 24, 2018
3e3616e
Check in bundle
gfodor May 24, 2018
7e30dc3
Reduce allocations
gfodor May 24, 2018
2920af3
More performance improvements and fix bug with not clearing backing s…
gfodor May 24, 2018
1569b43
Do equality checks before copying layers since they are usually the same
gfodor May 25, 2018
3213725
More equality check optimizations
gfodor May 25, 2018
399375f
Fix for ugly backing store bug
gfodor May 25, 2018
fe32421
Update build
gfodor May 25, 2018
e92c523
Update dist
gfodor Jun 14, 2018
08faefe
Update dist
gfodor Jun 14, 2018
33da801
Fix dep path to https
jakubkottnauer Jun 22, 2018
8be5cde
Remove package-lock, keep using yarn only
Aug 16, 2018
c087ca8
Remove unused babel decorators
Aug 16, 2018
ea10728
Removed duplicated index.js
Aug 16, 2018
3b4b37e
Removed unused create-react-class
Aug 16, 2018
8f07476
Remove unused babel-register
Aug 16, 2018
0fbc1a1
Move babel plugins to babelrc
Aug 16, 2018
87bc32b
Replaced webpack build with babel & build is NOT committed anymore!
Aug 16, 2018
3f53b13
Fixed build & storybook
Aug 17, 2018
a626c24
Fixed children proptype
Aug 17, 2018
93bff23
Dont run afterTick when canvas is already removed from DOM
Aug 17, 2018
6e41eac
Unify stories' names in storybook
Aug 17, 2018
e17358f
Added build to npm prepare (build before package is pushed)
Aug 17, 2018
08daec0
Merge pull request #1 from vojty/hotfix/proper-package-build
vitawasalreadytaken Aug 20, 2018
2b5d7c6
v1.6.0
Aug 21, 2018
a77629c
Ignore yarn log
Sep 12, 2018
d79b1ba
Fix prettier
Sep 12, 2018
75a6a5c
Eslint rules
Sep 12, 2018
5ff6db3
Keep defined RenderLayer zIndex
Sep 12, 2018
1be3ae7
Merge pull request #2 from vojty/hotfix/new-element-z-index
vitawasalreadytaken Sep 13, 2018
ad2f494
v1.6.1
Sep 13, 2018
5586699
Move React to peerDependencies
Sep 13, 2018
150b190
Merge pull request #3 from vojty/hotfix/react-as-peer
vitawasalreadytaken Sep 14, 2018
2fe0cf1
v1.6.2
Sep 14, 2018
3acbbb2
Added support for React 16.6.0
Oct 29, 2018
025493b
Merge pull request #4 from vojty/feature/support-react16.6.0
vitawasalreadytaken Nov 4, 2018
906224a
Fix event resubscription
jakubkottnauer Dec 5, 2018
71b690d
Merge pull request #6 from qntln/fix/event-registering
vitawasalreadytaken Dec 5, 2018
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
14 changes: 12 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
{
"presets": ["react"]
}
"presets": [
[
"env", {
"targets": {
"browsers": ["last 2 versions"]
}
}
],
"react",
"stage-2"
]
}
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = false
10 changes: 10 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = {
parser: "babel-eslint",
env: {
browser: true,
es6: true,
node: true
},
plugins: ["prettier", "react"],
extends: ["prettier", "plugin:react/recommended", "eslint:recommended"]
};
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
build
node_modules
yarn.lock
npm-debug.log
npm-debug.log
.idea
storybook-static
dist
yarn-error.log
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
build
.idea
node_modules
7 changes: 7 additions & 0 deletions .storybook/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { configure } from '@storybook/react';

function loadStories() {
require('../stories');
}

configure(loadStories, module);
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# react-canvas

This is a fork of [Flipboard/react-canvas](https://github.com/Flipboard/react-canvas) which:
- Upgrades to React 16 and uses a custom renderer with `react-reconciler`
- Converts to ES modules and modern ES6+
- Storybook for ease of testing examples
- Removes the need to use [brfs](https://github.com/substack/brfs) and `transform-loader` when using webpack.

This fork builds upon work by [CraigMorton](https://github.com/CraigMorton/react-canvas) and [CSBerger](https://github.com/CSberger/react-canvas)

# Original repo's README

[Introductory blog post](http://engineering.flipboard.com/2015/02/mobile-web)

React Canvas adds the ability for React components to render to `<canvas>` rather than DOM.
Expand Down
16 changes: 0 additions & 16 deletions examples/common/examples.css

This file was deleted.

Loading