Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
{
"name": "@latticehr/react-org-chart",
"version": "0.1.1",
"name": "@elsouza1985/react-org-chart",
"version": "1.0.1",
"description": "Simple, high-performance react component for d3 org chart",
"repository": "https://github.com/latticehr/react-org-chart.git",
"repository": {
"type": "git",
"url": "git+https://github.com/elsouza1985/react-org-chart.git"
},
"main": "dist/index.js",
"directories": {
"example": "src/examples"
Expand DownExpand Up@@ -32,8 +35,8 @@
"react": "^16.2.0",
"react-dom": "^16.2.0",
"rimraf": "^2.6.2",
"webpack": "^4.0.1",
"webpack-cli": "^2.0.10",
"webpack": "^4.41.2",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
},
"peerDependencies": {
Expand All@@ -46,5 +49,9 @@
"env",
"stage-2"
]
}
},
"bugs": {
"url": "https://github.com/elsouza1985/react-org-chart/issues"
},
"homepage": "https://github.com/elsouza1985/react-org-chart#readme"
}
12 changes: 6 additions & 6 deletions src/chart/config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@ const animationDuration = 350
const shouldResize = true

// Nodes
const nodeWidth = 240
const nodeHeight = 120
const nodeWidth = 300
const nodeHeight = 80
const nodeSpacing = 12
const nodePaddingX = 16
const nodePaddingX = 4
const nodePaddingY = 16
const avatarWidth = 40
const avatarWidth = 80
const nodeBorderRadius = 4
const margin = {
top: 20,
Expand All@@ -21,7 +21,7 @@ const lineType = 'angle'
const lineDepthY = 120 /* Height of the line for child nodes */

// Colors
const backgroundColor = '#fff'
const backgroundColor = 'rgb(243,244,246)'
const borderColor = '#e6e8e9'
const nameColor = '#222d38'
const titleColor = '#617080'
Expand All@@ -47,4 +47,4 @@ const config = {
shouldResize
}

module.exports = config
module.exports = config
72 changes: 36 additions & 36 deletions src/chart/render.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,56 +117,56 @@ function render(config) {
const heightForTitle = 45 // getHeightForText(d.person.title)

// Person's Reports
nodeEnter
.append('text')
.attr('class', PERSON_REPORTS_CLASS)
.attr('x', namePos.x)
.attr('y', namePos.y + nodePaddingY + heightForTitle)
.attr('dy', '.9em')
.style('font-size', 14)
.style('font-weight', 500)
.style('cursor', 'pointer')
.style('fill', reportsColor)
.text(helpers.getTextForTitle)
// nodeEnter
// .append('text')
// .attr('class', PERSON_REPORTS_CLASS)
// .attr('x', namePos.x)
// .attr('y', namePos.y + nodePaddingY + heightForTitle)
// .attr('dy', '.9em')
// .style('font-size', 14)
// .style('font-weight', 500)
// .style('cursor', 'pointer')
// .style('fill', reportsColor)
// .text(helpers.getTextForTitle)

// Person's Avatar
nodeEnter
.append('image')
.attr('width', avatarWidth)
.attr('height', avatarWidth)
.attr('x', nodePaddingX)
.attr('y', nodePaddingY)
.attr('width', 80)
.attr('height', 80)
.attr('x', 0)
.attr('y', 1)
.attr('stroke', borderColor)
.attr('src', d => d.person.avatar)
.attr('xlink:href', d => d.person.avatar)
.attr('clip-path', 'url(#avatarClip)')

// Person's Department
nodeEnter
.append('text')
.attr('class', getDepartmentClass)
.attr('x', 34)
.attr('y', avatarWidth + nodePaddingY * 1.2)
.attr('dy', '.9em')
.style('cursor', 'pointer')
.style('fill', titleColor)
.style('font-weight', 600)
.style('font-size', 8)
.attr('text-anchor', 'middle')
.text(helpers.getTextForDepartment)
// nodeEnter
// .append('text')
// .attr('class', getDepartmentClass)
// .attr('x', 34)
// .attr('y', avatarWidth + nodePaddingY * 1.2)
// .attr('dy', '.9em')
// .style('cursor', 'pointer')
// .style('fill', titleColor)
// .style('font-weight', 600)
// .style('font-size', 8)
// .attr('text-anchor', 'middle')
// .text(helpers.getTextForDepartment)

// Person's Link
const nodeLink = nodeEnter
.append('a')
.append('p')
.attr('class', PERSON_LINK_CLASS)
.attr('xlink:href', d => d.person.link || 'https://lattice.com')
.on('click', datum => {
d3.event.stopPropagation()
// TODO: fire link click handler
if (onPersonLinkClick) {
onPersonLinkClick(datum, d3.event)
}
})
// .attr('xlink:href', d => d.person.link || 'https://lattice.com')
// .on('click', datum => {
// d3.event.stopPropagation()
// // TODO: fire link click handler
// if (onPersonLinkClick) {
// onPersonLinkClick(datum, d3.event)
// }
// })

iconLink({
svg: nodeLink,
Expand Down
8 changes: 4 additions & 4 deletions src/defs/avatar-clip.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ module.exports = function defineAvatarClip(svg, id, config = {}) {
.append('clipPath')
.attr('id', id)
.append('circle')
.attr('cx', 34)
.attr('cy', 34)
.attr('r', 18)
}
.attr('cx', 35)
.attr('cy', 45)
.attr('r', 30)
}
2 changes: 1 addition & 1 deletion src/examples/react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ const props = {
// this could also just be `return tree.children`
return Promise.resolve(tree.children)
},
lineType: 'curve'
lineType: 'angle'
}

ReactDOM.render(React.createElement(OrgChart, props, null), root)
27 changes: 15 additions & 12 deletions webpack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,38 +2,41 @@ const webpack = require('webpack')
const { resolve } = require('path')

module.exports = {
name: '@latticehr/react-org-chart',
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: 'index.js',
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
library: '@latticehr/react-org-chart',
libraryTarget: 'commonjs2'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_'
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_'
}
}
}
root: '_',
},
},
}
75 changes: 29 additions & 46 deletions webpack.dev.config.js
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,43 @@
const glob = require('glob')
const webpack = require('webpack')
const { resolve } = require('path')

const getFilename = path =>
path
.split('\\')
.pop()
.split('/')
.pop()
.replace('.js', '')

const getExamples = () => {
return glob
.sync('./src/examples/*.js', {
matchBase: true
})
.map(getFilename)
.map(filename => ({
name: `example-${filename}`,
value: `./src/examples/${filename}.js`
}))
.reduce((acc, o) => {
acc[o.name] = o.value
return acc
}, {})
}

module.exports = {
name: 'react-org-chart',
cache: true,
devtool: 'cheap-module-eval-source-map',
entry: {
index: './src/index',
...getExamples()
},
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: '[name].bundle.js',
filename: 'index.js',
devtoolLineToLine: true,
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
publicPath: '/dist/'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
plugins: [
new webpack.DllReferencePlugin({
context: resolve(__dirname, 'src'),
manifest: resolve(__dirname, 'dist/manifest.json')
})
],
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
}
}
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_',
},
},
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
{
"name": "@latticehr/react-org-chart",
"version": "0.1.1",
"name": "@elsouza1985/react-org-chart",
"version": "1.0.1",
"description": "Simple, high-performance react component for d3 org chart",
"repository": "https://github.com/latticehr/react-org-chart.git",
"repository": {
"type": "git",
"url": "git+https://github.com/elsouza1985/react-org-chart.git"
},
"main": "dist/index.js",
"directories": {
"example": "src/examples"
Expand DownExpand Up@@ -32,8 +35,8 @@
"react": "^16.2.0",
"react-dom": "^16.2.0",
"rimraf": "^2.6.2",
"webpack": "^4.0.1",
"webpack-cli": "^2.0.10",
"webpack": "^4.41.2",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
},
"peerDependencies": {
Expand All@@ -46,5 +49,9 @@
"env",
"stage-2"
]
}
},
"bugs": {
"url": "https://github.com/elsouza1985/react-org-chart/issues"
},
"homepage": "https://github.com/elsouza1985/react-org-chart#readme"
}
12 changes: 6 additions & 6 deletions src/chart/config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@ const animationDuration = 350
const shouldResize = true

// Nodes
const nodeWidth = 240
const nodeHeight = 120
const nodeWidth = 300
const nodeHeight = 80
const nodeSpacing = 12
const nodePaddingX = 16
const nodePaddingX = 4
const nodePaddingY = 16
const avatarWidth = 40
const avatarWidth = 80
const nodeBorderRadius = 4
const margin = {
top: 20,
Expand All@@ -21,7 +21,7 @@ const lineType = 'angle'
const lineDepthY = 120 /* Height of the line for child nodes */

// Colors
const backgroundColor = '#fff'
const backgroundColor = 'rgb(243,244,246)'
const borderColor = '#e6e8e9'
const nameColor = '#222d38'
const titleColor = '#617080'
Expand All@@ -47,4 +47,4 @@ const config = {
shouldResize
}

module.exports = config
module.exports = config
72 changes: 36 additions & 36 deletions src/chart/render.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,56 +117,56 @@ function render(config) {
const heightForTitle = 45 // getHeightForText(d.person.title)

// Person's Reports
nodeEnter
.append('text')
.attr('class', PERSON_REPORTS_CLASS)
.attr('x', namePos.x)
.attr('y', namePos.y + nodePaddingY + heightForTitle)
.attr('dy', '.9em')
.style('font-size', 14)
.style('font-weight', 500)
.style('cursor', 'pointer')
.style('fill', reportsColor)
.text(helpers.getTextForTitle)
// nodeEnter
// .append('text')
// .attr('class', PERSON_REPORTS_CLASS)
// .attr('x', namePos.x)
// .attr('y', namePos.y + nodePaddingY + heightForTitle)
// .attr('dy', '.9em')
// .style('font-size', 14)
// .style('font-weight', 500)
// .style('cursor', 'pointer')
// .style('fill', reportsColor)
// .text(helpers.getTextForTitle)

// Person's Avatar
nodeEnter
.append('image')
.attr('width', avatarWidth)
.attr('height', avatarWidth)
.attr('x', nodePaddingX)
.attr('y', nodePaddingY)
.attr('width', 80)
.attr('height', 80)
.attr('x', 0)
.attr('y', 1)
.attr('stroke', borderColor)
.attr('src', d => d.person.avatar)
.attr('xlink:href', d => d.person.avatar)
.attr('clip-path', 'url(#avatarClip)')

// Person's Department
nodeEnter
.append('text')
.attr('class', getDepartmentClass)
.attr('x', 34)
.attr('y', avatarWidth + nodePaddingY * 1.2)
.attr('dy', '.9em')
.style('cursor', 'pointer')
.style('fill', titleColor)
.style('font-weight', 600)
.style('font-size', 8)
.attr('text-anchor', 'middle')
.text(helpers.getTextForDepartment)
// nodeEnter
// .append('text')
// .attr('class', getDepartmentClass)
// .attr('x', 34)
// .attr('y', avatarWidth + nodePaddingY * 1.2)
// .attr('dy', '.9em')
// .style('cursor', 'pointer')
// .style('fill', titleColor)
// .style('font-weight', 600)
// .style('font-size', 8)
// .attr('text-anchor', 'middle')
// .text(helpers.getTextForDepartment)

// Person's Link
const nodeLink = nodeEnter
.append('a')
.append('p')
.attr('class', PERSON_LINK_CLASS)
.attr('xlink:href', d => d.person.link || 'https://lattice.com')
.on('click', datum => {
d3.event.stopPropagation()
// TODO: fire link click handler
if (onPersonLinkClick) {
onPersonLinkClick(datum, d3.event)
}
})
// .attr('xlink:href', d => d.person.link || 'https://lattice.com')
// .on('click', datum => {
// d3.event.stopPropagation()
// // TODO: fire link click handler
// if (onPersonLinkClick) {
// onPersonLinkClick(datum, d3.event)
// }
// })

iconLink({
svg: nodeLink,
Expand Down
8 changes: 4 additions & 4 deletions src/defs/avatar-clip.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ module.exports = function defineAvatarClip(svg, id, config = {}) {
.append('clipPath')
.attr('id', id)
.append('circle')
.attr('cx', 34)
.attr('cy', 34)
.attr('r', 18)
}
.attr('cx', 35)
.attr('cy', 45)
.attr('r', 30)
}
2 changes: 1 addition & 1 deletion src/examples/react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ const props = {
// this could also just be `return tree.children`
return Promise.resolve(tree.children)
},
lineType: 'curve'
lineType: 'angle'
}

ReactDOM.render(React.createElement(OrgChart, props, null), root)
27 changes: 15 additions & 12 deletions webpack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,38 +2,41 @@ const webpack = require('webpack')
const { resolve } = require('path')

module.exports = {
name: '@latticehr/react-org-chart',
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: 'index.js',
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
library: '@latticehr/react-org-chart',
libraryTarget: 'commonjs2'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_'
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_'
}
}
}
root: '_',
},
},
}
75 changes: 29 additions & 46 deletions webpack.dev.config.js
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,43 @@
const glob = require('glob')
const webpack = require('webpack')
const { resolve } = require('path')

const getFilename = path =>
path
.split('\\')
.pop()
.split('/')
.pop()
.replace('.js', '')

const getExamples = () => {
return glob
.sync('./src/examples/*.js', {
matchBase: true
})
.map(getFilename)
.map(filename => ({
name: `example-${filename}`,
value: `./src/examples/${filename}.js`
}))
.reduce((acc, o) => {
acc[o.name] = o.value
return acc
}, {})
}

module.exports = {
name: 'react-org-chart',
cache: true,
devtool: 'cheap-module-eval-source-map',
entry: {
index: './src/index',
...getExamples()
},
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: '[name].bundle.js',
filename: 'index.js',
devtoolLineToLine: true,
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
publicPath: '/dist/'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
plugins: [
new webpack.DllReferencePlugin({
context: resolve(__dirname, 'src'),
manifest: resolve(__dirname, 'dist/manifest.json')
})
],
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
}
}
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_',
},
},
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
{
"name": "@latticehr/react-org-chart",
"version": "0.1.1",
"name": "@elsouza1985/react-org-chart",
"version": "1.0.1",
"description": "Simple, high-performance react component for d3 org chart",
"repository": "https://github.com/latticehr/react-org-chart.git",
"repository": {
"type": "git",
"url": "git+https://github.com/elsouza1985/react-org-chart.git"
},
"main": "dist/index.js",
"directories": {
"example": "src/examples"
Expand DownExpand Up@@ -32,8 +35,8 @@
"react": "^16.2.0",
"react-dom": "^16.2.0",
"rimraf": "^2.6.2",
"webpack": "^4.0.1",
"webpack-cli": "^2.0.10",
"webpack": "^4.41.2",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
},
"peerDependencies": {
Expand All@@ -46,5 +49,9 @@
"env",
"stage-2"
]
}
},
"bugs": {
"url": "https://github.com/elsouza1985/react-org-chart/issues"
},
"homepage": "https://github.com/elsouza1985/react-org-chart#readme"
}
12 changes: 6 additions & 6 deletions src/chart/config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@ const animationDuration = 350
const shouldResize = true

// Nodes
const nodeWidth = 240
const nodeHeight = 120
const nodeWidth = 300
const nodeHeight = 80
const nodeSpacing = 12
const nodePaddingX = 16
const nodePaddingX = 4
const nodePaddingY = 16
const avatarWidth = 40
const avatarWidth = 80
const nodeBorderRadius = 4
const margin = {
top: 20,
Expand All@@ -21,7 +21,7 @@ const lineType = 'angle'
const lineDepthY = 120 /* Height of the line for child nodes */

// Colors
const backgroundColor = '#fff'
const backgroundColor = 'rgb(243,244,246)'
const borderColor = '#e6e8e9'
const nameColor = '#222d38'
const titleColor = '#617080'
Expand All@@ -47,4 +47,4 @@ const config = {
shouldResize
}

module.exports = config
module.exports = config
72 changes: 36 additions & 36 deletions src/chart/render.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,56 +117,56 @@ function render(config) {
const heightForTitle = 45 // getHeightForText(d.person.title)

// Person's Reports
nodeEnter
.append('text')
.attr('class', PERSON_REPORTS_CLASS)
.attr('x', namePos.x)
.attr('y', namePos.y + nodePaddingY + heightForTitle)
.attr('dy', '.9em')
.style('font-size', 14)
.style('font-weight', 500)
.style('cursor', 'pointer')
.style('fill', reportsColor)
.text(helpers.getTextForTitle)
// nodeEnter
// .append('text')
// .attr('class', PERSON_REPORTS_CLASS)
// .attr('x', namePos.x)
// .attr('y', namePos.y + nodePaddingY + heightForTitle)
// .attr('dy', '.9em')
// .style('font-size', 14)
// .style('font-weight', 500)
// .style('cursor', 'pointer')
// .style('fill', reportsColor)
// .text(helpers.getTextForTitle)

// Person's Avatar
nodeEnter
.append('image')
.attr('width', avatarWidth)
.attr('height', avatarWidth)
.attr('x', nodePaddingX)
.attr('y', nodePaddingY)
.attr('width', 80)
.attr('height', 80)
.attr('x', 0)
.attr('y', 1)
.attr('stroke', borderColor)
.attr('src', d => d.person.avatar)
.attr('xlink:href', d => d.person.avatar)
.attr('clip-path', 'url(#avatarClip)')

// Person's Department
nodeEnter
.append('text')
.attr('class', getDepartmentClass)
.attr('x', 34)
.attr('y', avatarWidth + nodePaddingY * 1.2)
.attr('dy', '.9em')
.style('cursor', 'pointer')
.style('fill', titleColor)
.style('font-weight', 600)
.style('font-size', 8)
.attr('text-anchor', 'middle')
.text(helpers.getTextForDepartment)
// nodeEnter
// .append('text')
// .attr('class', getDepartmentClass)
// .attr('x', 34)
// .attr('y', avatarWidth + nodePaddingY * 1.2)
// .attr('dy', '.9em')
// .style('cursor', 'pointer')
// .style('fill', titleColor)
// .style('font-weight', 600)
// .style('font-size', 8)
// .attr('text-anchor', 'middle')
// .text(helpers.getTextForDepartment)

// Person's Link
const nodeLink = nodeEnter
.append('a')
.append('p')
.attr('class', PERSON_LINK_CLASS)
.attr('xlink:href', d => d.person.link || 'https://lattice.com')
.on('click', datum => {
d3.event.stopPropagation()
// TODO: fire link click handler
if (onPersonLinkClick) {
onPersonLinkClick(datum, d3.event)
}
})
// .attr('xlink:href', d => d.person.link || 'https://lattice.com')
// .on('click', datum => {
// d3.event.stopPropagation()
// // TODO: fire link click handler
// if (onPersonLinkClick) {
// onPersonLinkClick(datum, d3.event)
// }
// })

iconLink({
svg: nodeLink,
Expand Down
8 changes: 4 additions & 4 deletions src/defs/avatar-clip.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ module.exports = function defineAvatarClip(svg, id, config = {}) {
.append('clipPath')
.attr('id', id)
.append('circle')
.attr('cx', 34)
.attr('cy', 34)
.attr('r', 18)
}
.attr('cx', 35)
.attr('cy', 45)
.attr('r', 30)
}
2 changes: 1 addition & 1 deletion src/examples/react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ const props = {
// this could also just be `return tree.children`
return Promise.resolve(tree.children)
},
lineType: 'curve'
lineType: 'angle'
}

ReactDOM.render(React.createElement(OrgChart, props, null), root)
27 changes: 15 additions & 12 deletions webpack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,38 +2,41 @@ const webpack = require('webpack')
const { resolve } = require('path')

module.exports = {
name: '@latticehr/react-org-chart',
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: 'index.js',
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
library: '@latticehr/react-org-chart',
libraryTarget: 'commonjs2'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_'
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_'
}
}
}
root: '_',
},
},
}
75 changes: 29 additions & 46 deletions webpack.dev.config.js
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,43 @@
const glob = require('glob')
const webpack = require('webpack')
const { resolve } = require('path')

const getFilename = path =>
path
.split('\\')
.pop()
.split('/')
.pop()
.replace('.js', '')

const getExamples = () => {
return glob
.sync('./src/examples/*.js', {
matchBase: true
})
.map(getFilename)
.map(filename => ({
name: `example-${filename}`,
value: `./src/examples/${filename}.js`
}))
.reduce((acc, o) => {
acc[o.name] = o.value
return acc
}, {})
}

module.exports = {
name: 'react-org-chart',
cache: true,
devtool: 'cheap-module-eval-source-map',
entry: {
index: './src/index',
...getExamples()
},
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: '[name].bundle.js',
filename: 'index.js',
devtoolLineToLine: true,
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
publicPath: '/dist/'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
plugins: [
new webpack.DllReferencePlugin({
context: resolve(__dirname, 'src'),
manifest: resolve(__dirname, 'dist/manifest.json')
})
],
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
}
}
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_',
},
},
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
{
"name": "@latticehr/react-org-chart",
"version": "0.1.1",
"name": "@elsouza1985/react-org-chart",
"version": "1.0.1",
"description": "Simple, high-performance react component for d3 org chart",
"repository": "https://github.com/latticehr/react-org-chart.git",
"repository": {
"type": "git",
"url": "git+https://github.com/elsouza1985/react-org-chart.git"
},
"main": "dist/index.js",
"directories": {
"example": "src/examples"
Expand DownExpand Up@@ -32,8 +35,8 @@
"react": "^16.2.0",
"react-dom": "^16.2.0",
"rimraf": "^2.6.2",
"webpack": "^4.0.1",
"webpack-cli": "^2.0.10",
"webpack": "^4.41.2",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
},
"peerDependencies": {
Expand All@@ -46,5 +49,9 @@
"env",
"stage-2"
]
}
},
"bugs": {
"url": "https://github.com/elsouza1985/react-org-chart/issues"
},
"homepage": "https://github.com/elsouza1985/react-org-chart#readme"
}
12 changes: 6 additions & 6 deletions src/chart/config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@ const animationDuration = 350
const shouldResize = true

// Nodes
const nodeWidth = 240
const nodeHeight = 120
const nodeWidth = 300
const nodeHeight = 80
const nodeSpacing = 12
const nodePaddingX = 16
const nodePaddingX = 4
const nodePaddingY = 16
const avatarWidth = 40
const avatarWidth = 80
const nodeBorderRadius = 4
const margin = {
top: 20,
Expand All@@ -21,7 +21,7 @@ const lineType = 'angle'
const lineDepthY = 120 /* Height of the line for child nodes */

// Colors
const backgroundColor = '#fff'
const backgroundColor = 'rgb(243,244,246)'
const borderColor = '#e6e8e9'
const nameColor = '#222d38'
const titleColor = '#617080'
Expand All@@ -47,4 +47,4 @@ const config = {
shouldResize
}

module.exports = config
module.exports = config
72 changes: 36 additions & 36 deletions src/chart/render.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,56 +117,56 @@ function render(config) {
const heightForTitle = 45 // getHeightForText(d.person.title)

// Person's Reports
nodeEnter
.append('text')
.attr('class', PERSON_REPORTS_CLASS)
.attr('x', namePos.x)
.attr('y', namePos.y + nodePaddingY + heightForTitle)
.attr('dy', '.9em')
.style('font-size', 14)
.style('font-weight', 500)
.style('cursor', 'pointer')
.style('fill', reportsColor)
.text(helpers.getTextForTitle)
// nodeEnter
// .append('text')
// .attr('class', PERSON_REPORTS_CLASS)
// .attr('x', namePos.x)
// .attr('y', namePos.y + nodePaddingY + heightForTitle)
// .attr('dy', '.9em')
// .style('font-size', 14)
// .style('font-weight', 500)
// .style('cursor', 'pointer')
// .style('fill', reportsColor)
// .text(helpers.getTextForTitle)

// Person's Avatar
nodeEnter
.append('image')
.attr('width', avatarWidth)
.attr('height', avatarWidth)
.attr('x', nodePaddingX)
.attr('y', nodePaddingY)
.attr('width', 80)
.attr('height', 80)
.attr('x', 0)
.attr('y', 1)
.attr('stroke', borderColor)
.attr('src', d => d.person.avatar)
.attr('xlink:href', d => d.person.avatar)
.attr('clip-path', 'url(#avatarClip)')

// Person's Department
nodeEnter
.append('text')
.attr('class', getDepartmentClass)
.attr('x', 34)
.attr('y', avatarWidth + nodePaddingY * 1.2)
.attr('dy', '.9em')
.style('cursor', 'pointer')
.style('fill', titleColor)
.style('font-weight', 600)
.style('font-size', 8)
.attr('text-anchor', 'middle')
.text(helpers.getTextForDepartment)
// nodeEnter
// .append('text')
// .attr('class', getDepartmentClass)
// .attr('x', 34)
// .attr('y', avatarWidth + nodePaddingY * 1.2)
// .attr('dy', '.9em')
// .style('cursor', 'pointer')
// .style('fill', titleColor)
// .style('font-weight', 600)
// .style('font-size', 8)
// .attr('text-anchor', 'middle')
// .text(helpers.getTextForDepartment)

// Person's Link
const nodeLink = nodeEnter
.append('a')
.append('p')
.attr('class', PERSON_LINK_CLASS)
.attr('xlink:href', d => d.person.link || 'https://lattice.com')
.on('click', datum => {
d3.event.stopPropagation()
// TODO: fire link click handler
if (onPersonLinkClick) {
onPersonLinkClick(datum, d3.event)
}
})
// .attr('xlink:href', d => d.person.link || 'https://lattice.com')
// .on('click', datum => {
// d3.event.stopPropagation()
// // TODO: fire link click handler
// if (onPersonLinkClick) {
// onPersonLinkClick(datum, d3.event)
// }
// })

iconLink({
svg: nodeLink,
Expand Down
8 changes: 4 additions & 4 deletions src/defs/avatar-clip.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ module.exports = function defineAvatarClip(svg, id, config = {}) {
.append('clipPath')
.attr('id', id)
.append('circle')
.attr('cx', 34)
.attr('cy', 34)
.attr('r', 18)
}
.attr('cx', 35)
.attr('cy', 45)
.attr('r', 30)
}
2 changes: 1 addition & 1 deletion src/examples/react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ const props = {
// this could also just be `return tree.children`
return Promise.resolve(tree.children)
},
lineType: 'curve'
lineType: 'angle'
}

ReactDOM.render(React.createElement(OrgChart, props, null), root)
27 changes: 15 additions & 12 deletions webpack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,38 +2,41 @@ const webpack = require('webpack')
const { resolve } = require('path')

module.exports = {
name: '@latticehr/react-org-chart',
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: 'index.js',
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
library: '@latticehr/react-org-chart',
libraryTarget: 'commonjs2'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_'
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_'
}
}
}
root: '_',
},
},
}
75 changes: 29 additions & 46 deletions webpack.dev.config.js
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,43 @@
const glob = require('glob')
const webpack = require('webpack')
const { resolve } = require('path')

const getFilename = path =>
path
.split('\\')
.pop()
.split('/')
.pop()
.replace('.js', '')

const getExamples = () => {
return glob
.sync('./src/examples/*.js', {
matchBase: true
})
.map(getFilename)
.map(filename => ({
name: `example-${filename}`,
value: `./src/examples/${filename}.js`
}))
.reduce((acc, o) => {
acc[o.name] = o.value
return acc
}, {})
}

module.exports = {
name: 'react-org-chart',
cache: true,
devtool: 'cheap-module-eval-source-map',
entry: {
index: './src/index',
...getExamples()
},
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: '[name].bundle.js',
filename: 'index.js',
devtoolLineToLine: true,
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
publicPath: '/dist/'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
plugins: [
new webpack.DllReferencePlugin({
context: resolve(__dirname, 'src'),
manifest: resolve(__dirname, 'dist/manifest.json')
})
],
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
}
}
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_',
},
},
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
{
"name": "@latticehr/react-org-chart",
"version": "0.1.1",
"name": "@elsouza1985/react-org-chart",
"version": "1.0.1",
"description": "Simple, high-performance react component for d3 org chart",
"repository": "https://github.com/latticehr/react-org-chart.git",
"repository": {
"type": "git",
"url": "git+https://github.com/elsouza1985/react-org-chart.git"
},
"main": "dist/index.js",
"directories": {
"example": "src/examples"
Expand DownExpand Up@@ -32,8 +35,8 @@
"react": "^16.2.0",
"react-dom": "^16.2.0",
"rimraf": "^2.6.2",
"webpack": "^4.0.1",
"webpack-cli": "^2.0.10",
"webpack": "^4.41.2",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
},
"peerDependencies": {
Expand All@@ -46,5 +49,9 @@
"env",
"stage-2"
]
}
},
"bugs": {
"url": "https://github.com/elsouza1985/react-org-chart/issues"
},
"homepage": "https://github.com/elsouza1985/react-org-chart#readme"
}
12 changes: 6 additions & 6 deletions src/chart/config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@ const animationDuration = 350
const shouldResize = true

// Nodes
const nodeWidth = 240
const nodeHeight = 120
const nodeWidth = 300
const nodeHeight = 80
const nodeSpacing = 12
const nodePaddingX = 16
const nodePaddingX = 4
const nodePaddingY = 16
const avatarWidth = 40
const avatarWidth = 80
const nodeBorderRadius = 4
const margin = {
top: 20,
Expand All@@ -21,7 +21,7 @@ const lineType = 'angle'
const lineDepthY = 120 /* Height of the line for child nodes */

// Colors
const backgroundColor = '#fff'
const backgroundColor = 'rgb(243,244,246)'
const borderColor = '#e6e8e9'
const nameColor = '#222d38'
const titleColor = '#617080'
Expand All@@ -47,4 +47,4 @@ const config = {
shouldResize
}

module.exports = config
module.exports = config
72 changes: 36 additions & 36 deletions src/chart/render.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,56 +117,56 @@ function render(config) {
const heightForTitle = 45 // getHeightForText(d.person.title)

// Person's Reports
nodeEnter
.append('text')
.attr('class', PERSON_REPORTS_CLASS)
.attr('x', namePos.x)
.attr('y', namePos.y + nodePaddingY + heightForTitle)
.attr('dy', '.9em')
.style('font-size', 14)
.style('font-weight', 500)
.style('cursor', 'pointer')
.style('fill', reportsColor)
.text(helpers.getTextForTitle)
// nodeEnter
// .append('text')
// .attr('class', PERSON_REPORTS_CLASS)
// .attr('x', namePos.x)
// .attr('y', namePos.y + nodePaddingY + heightForTitle)
// .attr('dy', '.9em')
// .style('font-size', 14)
// .style('font-weight', 500)
// .style('cursor', 'pointer')
// .style('fill', reportsColor)
// .text(helpers.getTextForTitle)

// Person's Avatar
nodeEnter
.append('image')
.attr('width', avatarWidth)
.attr('height', avatarWidth)
.attr('x', nodePaddingX)
.attr('y', nodePaddingY)
.attr('width', 80)
.attr('height', 80)
.attr('x', 0)
.attr('y', 1)
.attr('stroke', borderColor)
.attr('src', d => d.person.avatar)
.attr('xlink:href', d => d.person.avatar)
.attr('clip-path', 'url(#avatarClip)')

// Person's Department
nodeEnter
.append('text')
.attr('class', getDepartmentClass)
.attr('x', 34)
.attr('y', avatarWidth + nodePaddingY * 1.2)
.attr('dy', '.9em')
.style('cursor', 'pointer')
.style('fill', titleColor)
.style('font-weight', 600)
.style('font-size', 8)
.attr('text-anchor', 'middle')
.text(helpers.getTextForDepartment)
// nodeEnter
// .append('text')
// .attr('class', getDepartmentClass)
// .attr('x', 34)
// .attr('y', avatarWidth + nodePaddingY * 1.2)
// .attr('dy', '.9em')
// .style('cursor', 'pointer')
// .style('fill', titleColor)
// .style('font-weight', 600)
// .style('font-size', 8)
// .attr('text-anchor', 'middle')
// .text(helpers.getTextForDepartment)

// Person's Link
const nodeLink = nodeEnter
.append('a')
.append('p')
.attr('class', PERSON_LINK_CLASS)
.attr('xlink:href', d => d.person.link || 'https://lattice.com')
.on('click', datum => {
d3.event.stopPropagation()
// TODO: fire link click handler
if (onPersonLinkClick) {
onPersonLinkClick(datum, d3.event)
}
})
// .attr('xlink:href', d => d.person.link || 'https://lattice.com')
// .on('click', datum => {
// d3.event.stopPropagation()
// // TODO: fire link click handler
// if (onPersonLinkClick) {
// onPersonLinkClick(datum, d3.event)
// }
// })

iconLink({
svg: nodeLink,
Expand Down
8 changes: 4 additions & 4 deletions src/defs/avatar-clip.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ module.exports = function defineAvatarClip(svg, id, config = {}) {
.append('clipPath')
.attr('id', id)
.append('circle')
.attr('cx', 34)
.attr('cy', 34)
.attr('r', 18)
}
.attr('cx', 35)
.attr('cy', 45)
.attr('r', 30)
}
2 changes: 1 addition & 1 deletion src/examples/react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ const props = {
// this could also just be `return tree.children`
return Promise.resolve(tree.children)
},
lineType: 'curve'
lineType: 'angle'
}

ReactDOM.render(React.createElement(OrgChart, props, null), root)
27 changes: 15 additions & 12 deletions webpack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,38 +2,41 @@ const webpack = require('webpack')
const { resolve } = require('path')

module.exports = {
name: '@latticehr/react-org-chart',
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: 'index.js',
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
library: '@latticehr/react-org-chart',
libraryTarget: 'commonjs2'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_'
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_'
}
}
}
root: '_',
},
},
}
75 changes: 29 additions & 46 deletions webpack.dev.config.js
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,43 @@
const glob = require('glob')
const webpack = require('webpack')
const { resolve } = require('path')

const getFilename = path =>
path
.split('\\')
.pop()
.split('/')
.pop()
.replace('.js', '')

const getExamples = () => {
return glob
.sync('./src/examples/*.js', {
matchBase: true
})
.map(getFilename)
.map(filename => ({
name: `example-${filename}`,
value: `./src/examples/${filename}.js`
}))
.reduce((acc, o) => {
acc[o.name] = o.value
return acc
}, {})
}

module.exports = {
name: 'react-org-chart',
cache: true,
devtool: 'cheap-module-eval-source-map',
entry: {
index: './src/index',
...getExamples()
},
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: '[name].bundle.js',
filename: 'index.js',
devtoolLineToLine: true,
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
publicPath: '/dist/'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
plugins: [
new webpack.DllReferencePlugin({
context: resolve(__dirname, 'src'),
manifest: resolve(__dirname, 'dist/manifest.json')
})
],
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
}
}
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_',
},
},
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
{
"name": "@latticehr/react-org-chart",
"version": "0.1.1",
"name": "@elsouza1985/react-org-chart",
"version": "1.0.1",
"description": "Simple, high-performance react component for d3 org chart",
"repository": "https://github.com/latticehr/react-org-chart.git",
"repository": {
"type": "git",
"url": "git+https://github.com/elsouza1985/react-org-chart.git"
},
"main": "dist/index.js",
"directories": {
"example": "src/examples"
Expand DownExpand Up@@ -32,8 +35,8 @@
"react": "^16.2.0",
"react-dom": "^16.2.0",
"rimraf": "^2.6.2",
"webpack": "^4.0.1",
"webpack-cli": "^2.0.10",
"webpack": "^4.41.2",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
},
"peerDependencies": {
Expand All@@ -46,5 +49,9 @@
"env",
"stage-2"
]
}
},
"bugs": {
"url": "https://github.com/elsouza1985/react-org-chart/issues"
},
"homepage": "https://github.com/elsouza1985/react-org-chart#readme"
}
12 changes: 6 additions & 6 deletions src/chart/config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@ const animationDuration = 350
const shouldResize = true

// Nodes
const nodeWidth = 240
const nodeHeight = 120
const nodeWidth = 300
const nodeHeight = 80
const nodeSpacing = 12
const nodePaddingX = 16
const nodePaddingX = 4
const nodePaddingY = 16
const avatarWidth = 40
const avatarWidth = 80
const nodeBorderRadius = 4
const margin = {
top: 20,
Expand All@@ -21,7 +21,7 @@ const lineType = 'angle'
const lineDepthY = 120 /* Height of the line for child nodes */

// Colors
const backgroundColor = '#fff'
const backgroundColor = 'rgb(243,244,246)'
const borderColor = '#e6e8e9'
const nameColor = '#222d38'
const titleColor = '#617080'
Expand All@@ -47,4 +47,4 @@ const config = {
shouldResize
}

module.exports = config
module.exports = config
72 changes: 36 additions & 36 deletions src/chart/render.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,56 +117,56 @@ function render(config) {
const heightForTitle = 45 // getHeightForText(d.person.title)

// Person's Reports
nodeEnter
.append('text')
.attr('class', PERSON_REPORTS_CLASS)
.attr('x', namePos.x)
.attr('y', namePos.y + nodePaddingY + heightForTitle)
.attr('dy', '.9em')
.style('font-size', 14)
.style('font-weight', 500)
.style('cursor', 'pointer')
.style('fill', reportsColor)
.text(helpers.getTextForTitle)
// nodeEnter
// .append('text')
// .attr('class', PERSON_REPORTS_CLASS)
// .attr('x', namePos.x)
// .attr('y', namePos.y + nodePaddingY + heightForTitle)
// .attr('dy', '.9em')
// .style('font-size', 14)
// .style('font-weight', 500)
// .style('cursor', 'pointer')
// .style('fill', reportsColor)
// .text(helpers.getTextForTitle)

// Person's Avatar
nodeEnter
.append('image')
.attr('width', avatarWidth)
.attr('height', avatarWidth)
.attr('x', nodePaddingX)
.attr('y', nodePaddingY)
.attr('width', 80)
.attr('height', 80)
.attr('x', 0)
.attr('y', 1)
.attr('stroke', borderColor)
.attr('src', d => d.person.avatar)
.attr('xlink:href', d => d.person.avatar)
.attr('clip-path', 'url(#avatarClip)')

// Person's Department
nodeEnter
.append('text')
.attr('class', getDepartmentClass)
.attr('x', 34)
.attr('y', avatarWidth + nodePaddingY * 1.2)
.attr('dy', '.9em')
.style('cursor', 'pointer')
.style('fill', titleColor)
.style('font-weight', 600)
.style('font-size', 8)
.attr('text-anchor', 'middle')
.text(helpers.getTextForDepartment)
// nodeEnter
// .append('text')
// .attr('class', getDepartmentClass)
// .attr('x', 34)
// .attr('y', avatarWidth + nodePaddingY * 1.2)
// .attr('dy', '.9em')
// .style('cursor', 'pointer')
// .style('fill', titleColor)
// .style('font-weight', 600)
// .style('font-size', 8)
// .attr('text-anchor', 'middle')
// .text(helpers.getTextForDepartment)

// Person's Link
const nodeLink = nodeEnter
.append('a')
.append('p')
.attr('class', PERSON_LINK_CLASS)
.attr('xlink:href', d => d.person.link || 'https://lattice.com')
.on('click', datum => {
d3.event.stopPropagation()
// TODO: fire link click handler
if (onPersonLinkClick) {
onPersonLinkClick(datum, d3.event)
}
})
// .attr('xlink:href', d => d.person.link || 'https://lattice.com')
// .on('click', datum => {
// d3.event.stopPropagation()
// // TODO: fire link click handler
// if (onPersonLinkClick) {
// onPersonLinkClick(datum, d3.event)
// }
// })

iconLink({
svg: nodeLink,
Expand Down
8 changes: 4 additions & 4 deletions src/defs/avatar-clip.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ module.exports = function defineAvatarClip(svg, id, config = {}) {
.append('clipPath')
.attr('id', id)
.append('circle')
.attr('cx', 34)
.attr('cy', 34)
.attr('r', 18)
}
.attr('cx', 35)
.attr('cy', 45)
.attr('r', 30)
}
2 changes: 1 addition & 1 deletion src/examples/react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ const props = {
// this could also just be `return tree.children`
return Promise.resolve(tree.children)
},
lineType: 'curve'
lineType: 'angle'
}

ReactDOM.render(React.createElement(OrgChart, props, null), root)
27 changes: 15 additions & 12 deletions webpack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,38 +2,41 @@ const webpack = require('webpack')
const { resolve } = require('path')

module.exports = {
name: '@latticehr/react-org-chart',
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: 'index.js',
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
library: '@latticehr/react-org-chart',
libraryTarget: 'commonjs2'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_'
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_'
}
}
}
root: '_',
},
},
}
75 changes: 29 additions & 46 deletions webpack.dev.config.js
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,43 @@
const glob = require('glob')
const webpack = require('webpack')
const { resolve } = require('path')

const getFilename = path =>
path
.split('\\')
.pop()
.split('/')
.pop()
.replace('.js', '')

const getExamples = () => {
return glob
.sync('./src/examples/*.js', {
matchBase: true
})
.map(getFilename)
.map(filename => ({
name: `example-${filename}`,
value: `./src/examples/${filename}.js`
}))
.reduce((acc, o) => {
acc[o.name] = o.value
return acc
}, {})
}

module.exports = {
name: 'react-org-chart',
cache: true,
devtool: 'cheap-module-eval-source-map',
entry: {
index: './src/index',
...getExamples()
},
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: '[name].bundle.js',
filename: 'index.js',
devtoolLineToLine: true,
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
publicPath: '/dist/'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
plugins: [
new webpack.DllReferencePlugin({
context: resolve(__dirname, 'src'),
manifest: resolve(__dirname, 'dist/manifest.json')
})
],
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
}
}
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_',
},
},
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
{
"name": "@latticehr/react-org-chart",
"version": "0.1.1",
"name": "@elsouza1985/react-org-chart",
"version": "1.0.1",
"description": "Simple, high-performance react component for d3 org chart",
"repository": "https://github.com/latticehr/react-org-chart.git",
"repository": {
"type": "git",
"url": "git+https://github.com/elsouza1985/react-org-chart.git"
},
"main": "dist/index.js",
"directories": {
"example": "src/examples"
Expand DownExpand Up@@ -32,8 +35,8 @@
"react": "^16.2.0",
"react-dom": "^16.2.0",
"rimraf": "^2.6.2",
"webpack": "^4.0.1",
"webpack-cli": "^2.0.10",
"webpack": "^4.41.2",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
},
"peerDependencies": {
Expand All@@ -46,5 +49,9 @@
"env",
"stage-2"
]
}
},
"bugs": {
"url": "https://github.com/elsouza1985/react-org-chart/issues"
},
"homepage": "https://github.com/elsouza1985/react-org-chart#readme"
}
12 changes: 6 additions & 6 deletions src/chart/config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@ const animationDuration = 350
const shouldResize = true

// Nodes
const nodeWidth = 240
const nodeHeight = 120
const nodeWidth = 300
const nodeHeight = 80
const nodeSpacing = 12
const nodePaddingX = 16
const nodePaddingX = 4
const nodePaddingY = 16
const avatarWidth = 40
const avatarWidth = 80
const nodeBorderRadius = 4
const margin = {
top: 20,
Expand All@@ -21,7 +21,7 @@ const lineType = 'angle'
const lineDepthY = 120 /* Height of the line for child nodes */

// Colors
const backgroundColor = '#fff'
const backgroundColor = 'rgb(243,244,246)'
const borderColor = '#e6e8e9'
const nameColor = '#222d38'
const titleColor = '#617080'
Expand All@@ -47,4 +47,4 @@ const config = {
shouldResize
}

module.exports = config
module.exports = config
72 changes: 36 additions & 36 deletions src/chart/render.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,56 +117,56 @@ function render(config) {
const heightForTitle = 45 // getHeightForText(d.person.title)

// Person's Reports
nodeEnter
.append('text')
.attr('class', PERSON_REPORTS_CLASS)
.attr('x', namePos.x)
.attr('y', namePos.y + nodePaddingY + heightForTitle)
.attr('dy', '.9em')
.style('font-size', 14)
.style('font-weight', 500)
.style('cursor', 'pointer')
.style('fill', reportsColor)
.text(helpers.getTextForTitle)
// nodeEnter
// .append('text')
// .attr('class', PERSON_REPORTS_CLASS)
// .attr('x', namePos.x)
// .attr('y', namePos.y + nodePaddingY + heightForTitle)
// .attr('dy', '.9em')
// .style('font-size', 14)
// .style('font-weight', 500)
// .style('cursor', 'pointer')
// .style('fill', reportsColor)
// .text(helpers.getTextForTitle)

// Person's Avatar
nodeEnter
.append('image')
.attr('width', avatarWidth)
.attr('height', avatarWidth)
.attr('x', nodePaddingX)
.attr('y', nodePaddingY)
.attr('width', 80)
.attr('height', 80)
.attr('x', 0)
.attr('y', 1)
.attr('stroke', borderColor)
.attr('src', d => d.person.avatar)
.attr('xlink:href', d => d.person.avatar)
.attr('clip-path', 'url(#avatarClip)')

// Person's Department
nodeEnter
.append('text')
.attr('class', getDepartmentClass)
.attr('x', 34)
.attr('y', avatarWidth + nodePaddingY * 1.2)
.attr('dy', '.9em')
.style('cursor', 'pointer')
.style('fill', titleColor)
.style('font-weight', 600)
.style('font-size', 8)
.attr('text-anchor', 'middle')
.text(helpers.getTextForDepartment)
// nodeEnter
// .append('text')
// .attr('class', getDepartmentClass)
// .attr('x', 34)
// .attr('y', avatarWidth + nodePaddingY * 1.2)
// .attr('dy', '.9em')
// .style('cursor', 'pointer')
// .style('fill', titleColor)
// .style('font-weight', 600)
// .style('font-size', 8)
// .attr('text-anchor', 'middle')
// .text(helpers.getTextForDepartment)

// Person's Link
const nodeLink = nodeEnter
.append('a')
.append('p')
.attr('class', PERSON_LINK_CLASS)
.attr('xlink:href', d => d.person.link || 'https://lattice.com')
.on('click', datum => {
d3.event.stopPropagation()
// TODO: fire link click handler
if (onPersonLinkClick) {
onPersonLinkClick(datum, d3.event)
}
})
// .attr('xlink:href', d => d.person.link || 'https://lattice.com')
// .on('click', datum => {
// d3.event.stopPropagation()
// // TODO: fire link click handler
// if (onPersonLinkClick) {
// onPersonLinkClick(datum, d3.event)
// }
// })

iconLink({
svg: nodeLink,
Expand Down
8 changes: 4 additions & 4 deletions src/defs/avatar-clip.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ module.exports = function defineAvatarClip(svg, id, config = {}) {
.append('clipPath')
.attr('id', id)
.append('circle')
.attr('cx', 34)
.attr('cy', 34)
.attr('r', 18)
}
.attr('cx', 35)
.attr('cy', 45)
.attr('r', 30)
}
2 changes: 1 addition & 1 deletion src/examples/react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ const props = {
// this could also just be `return tree.children`
return Promise.resolve(tree.children)
},
lineType: 'curve'
lineType: 'angle'
}

ReactDOM.render(React.createElement(OrgChart, props, null), root)
27 changes: 15 additions & 12 deletions webpack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,38 +2,41 @@ const webpack = require('webpack')
const { resolve } = require('path')

module.exports = {
name: '@latticehr/react-org-chart',
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: 'index.js',
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
library: '@latticehr/react-org-chart',
libraryTarget: 'commonjs2'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_'
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_'
}
}
}
root: '_',
},
},
}
75 changes: 29 additions & 46 deletions webpack.dev.config.js
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,43 @@
const glob = require('glob')
const webpack = require('webpack')
const { resolve } = require('path')

const getFilename = path =>
path
.split('\\')
.pop()
.split('/')
.pop()
.replace('.js', '')

const getExamples = () => {
return glob
.sync('./src/examples/*.js', {
matchBase: true
})
.map(getFilename)
.map(filename => ({
name: `example-${filename}`,
value: `./src/examples/${filename}.js`
}))
.reduce((acc, o) => {
acc[o.name] = o.value
return acc
}, {})
}

module.exports = {
name: 'react-org-chart',
cache: true,
devtool: 'cheap-module-eval-source-map',
entry: {
index: './src/index',
...getExamples()
},
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: '[name].bundle.js',
filename: 'index.js',
devtoolLineToLine: true,
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
publicPath: '/dist/'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
plugins: [
new webpack.DllReferencePlugin({
context: resolve(__dirname, 'src'),
manifest: resolve(__dirname, 'dist/manifest.json')
})
],
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
}
}
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_',
},
},
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
{
"name": "@latticehr/react-org-chart",
"version": "0.1.1",
"name": "@elsouza1985/react-org-chart",
"version": "1.0.1",
"description": "Simple, high-performance react component for d3 org chart",
"repository": "https://github.com/latticehr/react-org-chart.git",
"repository": {
"type": "git",
"url": "git+https://github.com/elsouza1985/react-org-chart.git"
},
"main": "dist/index.js",
"directories": {
"example": "src/examples"
Expand DownExpand Up@@ -32,8 +35,8 @@
"react": "^16.2.0",
"react-dom": "^16.2.0",
"rimraf": "^2.6.2",
"webpack": "^4.0.1",
"webpack-cli": "^2.0.10",
"webpack": "^4.41.2",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
},
"peerDependencies": {
Expand All@@ -46,5 +49,9 @@
"env",
"stage-2"
]
}
},
"bugs": {
"url": "https://github.com/elsouza1985/react-org-chart/issues"
},
"homepage": "https://github.com/elsouza1985/react-org-chart#readme"
}
12 changes: 6 additions & 6 deletions src/chart/config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@ const animationDuration = 350
const shouldResize = true

// Nodes
const nodeWidth = 240
const nodeHeight = 120
const nodeWidth = 300
const nodeHeight = 80
const nodeSpacing = 12
const nodePaddingX = 16
const nodePaddingX = 4
const nodePaddingY = 16
const avatarWidth = 40
const avatarWidth = 80
const nodeBorderRadius = 4
const margin = {
top: 20,
Expand All@@ -21,7 +21,7 @@ const lineType = 'angle'
const lineDepthY = 120 /* Height of the line for child nodes */

// Colors
const backgroundColor = '#fff'
const backgroundColor = 'rgb(243,244,246)'
const borderColor = '#e6e8e9'
const nameColor = '#222d38'
const titleColor = '#617080'
Expand All@@ -47,4 +47,4 @@ const config = {
shouldResize
}

module.exports = config
module.exports = config
72 changes: 36 additions & 36 deletions src/chart/render.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,56 +117,56 @@ function render(config) {
const heightForTitle = 45 // getHeightForText(d.person.title)

// Person's Reports
nodeEnter
.append('text')
.attr('class', PERSON_REPORTS_CLASS)
.attr('x', namePos.x)
.attr('y', namePos.y + nodePaddingY + heightForTitle)
.attr('dy', '.9em')
.style('font-size', 14)
.style('font-weight', 500)
.style('cursor', 'pointer')
.style('fill', reportsColor)
.text(helpers.getTextForTitle)
// nodeEnter
// .append('text')
// .attr('class', PERSON_REPORTS_CLASS)
// .attr('x', namePos.x)
// .attr('y', namePos.y + nodePaddingY + heightForTitle)
// .attr('dy', '.9em')
// .style('font-size', 14)
// .style('font-weight', 500)
// .style('cursor', 'pointer')
// .style('fill', reportsColor)
// .text(helpers.getTextForTitle)

// Person's Avatar
nodeEnter
.append('image')
.attr('width', avatarWidth)
.attr('height', avatarWidth)
.attr('x', nodePaddingX)
.attr('y', nodePaddingY)
.attr('width', 80)
.attr('height', 80)
.attr('x', 0)
.attr('y', 1)
.attr('stroke', borderColor)
.attr('src', d => d.person.avatar)
.attr('xlink:href', d => d.person.avatar)
.attr('clip-path', 'url(#avatarClip)')

// Person's Department
nodeEnter
.append('text')
.attr('class', getDepartmentClass)
.attr('x', 34)
.attr('y', avatarWidth + nodePaddingY * 1.2)
.attr('dy', '.9em')
.style('cursor', 'pointer')
.style('fill', titleColor)
.style('font-weight', 600)
.style('font-size', 8)
.attr('text-anchor', 'middle')
.text(helpers.getTextForDepartment)
// nodeEnter
// .append('text')
// .attr('class', getDepartmentClass)
// .attr('x', 34)
// .attr('y', avatarWidth + nodePaddingY * 1.2)
// .attr('dy', '.9em')
// .style('cursor', 'pointer')
// .style('fill', titleColor)
// .style('font-weight', 600)
// .style('font-size', 8)
// .attr('text-anchor', 'middle')
// .text(helpers.getTextForDepartment)

// Person's Link
const nodeLink = nodeEnter
.append('a')
.append('p')
.attr('class', PERSON_LINK_CLASS)
.attr('xlink:href', d => d.person.link || 'https://lattice.com')
.on('click', datum => {
d3.event.stopPropagation()
// TODO: fire link click handler
if (onPersonLinkClick) {
onPersonLinkClick(datum, d3.event)
}
})
// .attr('xlink:href', d => d.person.link || 'https://lattice.com')
// .on('click', datum => {
// d3.event.stopPropagation()
// // TODO: fire link click handler
// if (onPersonLinkClick) {
// onPersonLinkClick(datum, d3.event)
// }
// })

iconLink({
svg: nodeLink,
Expand Down
8 changes: 4 additions & 4 deletions src/defs/avatar-clip.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ module.exports = function defineAvatarClip(svg, id, config = {}) {
.append('clipPath')
.attr('id', id)
.append('circle')
.attr('cx', 34)
.attr('cy', 34)
.attr('r', 18)
}
.attr('cx', 35)
.attr('cy', 45)
.attr('r', 30)
}
2 changes: 1 addition & 1 deletion src/examples/react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ const props = {
// this could also just be `return tree.children`
return Promise.resolve(tree.children)
},
lineType: 'curve'
lineType: 'angle'
}

ReactDOM.render(React.createElement(OrgChart, props, null), root)
27 changes: 15 additions & 12 deletions webpack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,38 +2,41 @@ const webpack = require('webpack')
const { resolve } = require('path')

module.exports = {
name: '@latticehr/react-org-chart',
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: 'index.js',
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
library: '@latticehr/react-org-chart',
libraryTarget: 'commonjs2'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_'
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_'
}
}
}
root: '_',
},
},
}
75 changes: 29 additions & 46 deletions webpack.dev.config.js
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,43 @@
const glob = require('glob')
const webpack = require('webpack')
const { resolve } = require('path')

const getFilename = path =>
path
.split('\\')
.pop()
.split('/')
.pop()
.replace('.js', '')

const getExamples = () => {
return glob
.sync('./src/examples/*.js', {
matchBase: true
})
.map(getFilename)
.map(filename => ({
name: `example-${filename}`,
value: `./src/examples/${filename}.js`
}))
.reduce((acc, o) => {
acc[o.name] = o.value
return acc
}, {})
}

module.exports = {
name: 'react-org-chart',
cache: true,
devtool: 'cheap-module-eval-source-map',
entry: {
index: './src/index',
...getExamples()
},
name: '@elsouza1985/react-org-chart',
devtool: 'source-map',
entry: './src/index.js',
output: {
filename: '[name].bundle.js',
filename: 'index.js',
devtoolLineToLine: true,
sourceMapFilename: './index.js.map',
pathinfo: true,
path: resolve(__dirname, 'dist'),
publicPath: '/dist/'
library: '@elsouza1985/react-org-chart',
libraryTarget: 'commonjs2',
},
plugins: [
new webpack.DllReferencePlugin({
context: resolve(__dirname, 'src'),
manifest: resolve(__dirname, 'dist/manifest.json')
})
],
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
]
use: ['babel-loader'],
},
],
},
resolve: {
extensions: ['*', '.js', '.jsx']
}
}
extensions: ['*', '.js', '.jsx'],
},
externals: {
d3: {
commonjs: 'd3',
commonjs2: 'd3',
amd: 'd3',
root: '_',
},
react: {
commonjs: 'react',
commonjs2: 'react',
amd: 'react',
root: '_',
},
},
}