Skip to content

Update border.js #58

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update border.js #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 17 additions & 9 deletions src/border.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,27 @@ import { getSchemeColorFromTheme } from './schemeColor'
import { getTextByPathList } from './utils'

export function getBorder(node, elType, warpObj) {
let lineNode = getTextByPathList(node, ['p:spPr', 'a:ln'])
if (!lineNode) {
const lnRefNode = getTextByPathList(node, ['p:style', 'a:lnRef'])
if (lnRefNode) {
const lnIdx = getTextByPathList(lnRefNode, ['attrs', 'idx'])
lineNode = warpObj['themeContent']['a:theme']['a:themeElements']['a:fmtScheme']['a:lnStyleLst']['a:ln'][Number(lnIdx) - 1]
}
let defaultLineNode = null
const lnRefNode = getTextByPathList(node, ['p:style', 'a:lnRef'])
if (lnRefNode) {
const lnIdx = getTextByPathList(lnRefNode, ['attrs', 'idx'])
defaultLineNode = warpObj['themeContent']['a:theme']['a:themeElements']['a:fmtScheme']['a:lnStyleLst']['a:ln'][Number(lnIdx) - 1]
}
const defaultBorderWidth = defaultLineNode && !getTextByPathList(defaultLineNode, ['a:noFill']) ? (parseInt(getTextByPathList(defaultLineNode, ['attrs', 'w'])) / 12700) : 0
let lineNode = getTextByPathList(node, ['p:spPr', 'a:ln'])
// if (!lineNode) {
// const lnRefNode = getTextByPathList(node, ['p:style', 'a:lnRef'])
// if (lnRefNode) {
// const lnIdx = getTextByPathList(lnRefNode, ['attrs', 'idx'])
// lineNode = warpObj['themeContent']['a:theme']['a:themeElements']['a:fmtScheme']['a:lnStyleLst']['a:ln'][Number(lnIdx) - 1]
// }
// }
if (!lineNode) lineNode = node

const isNoFill = getTextByPathList(lineNode, ['a:noFill'])

let borderWidth = isNoFill ? 0 : (parseInt(getTextByPathList(lineNode, ['attrs', 'w'])) / 12700)
const lineWidth = getTextByPathList(lineNode, ['attrs', 'w'])
let borderWidth = isNoFill ? 0 : lineWidth ? (parseInt(lineWidth) / 12700) : defaultBorderWidth
if (isNaN(borderWidth)) {
if (lineNode) borderWidth = 0
else if (elType !== 'obj') borderWidth = 0
Expand Down Expand Up @@ -102,4 +110,4 @@ export function getBorder(node, elType, warpObj) {
borderType,
strokeDasharray,
}
}
}