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

Decrease rerenders #3

Merged
merged 1 commit into from
Sep 9, 2021
Merged
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
46 changes: 29 additions & 17 deletions src/html.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react'
import _ from 'lodash'
import { canvasStyle, mirrorProps } from './common'
import { omit } from './helpers'

Expand Down Expand Up @@ -39,10 +40,7 @@ function dummySpan (text) {
}

function unwrapTextNode (node) {
node.parentNode.replaceChild(
document.createTextNode(node.textContent),
node
)
node.parentNode.replaceChild(document.createTextNode(node.textContent), node)
}

function removeFollowingElementLeaves (node, root) {
Expand All @@ -56,14 +54,19 @@ function removeFollowingElementLeaves (node, root) {
function findBlockAncestor (node) {
let ndAncestor = node
while ((ndAncestor = ndAncestor.parentNode)) {
if (/p|div|main|section|h\d|ul|ol|li/.test(ndAncestor.tagName.toLowerCase())) {
if (
/p|div|main|section|h\d|ul|ol|li/.test(ndAncestor.tagName.toLowerCase())
) {
return ndAncestor
}
}
}

function affectLayout (ndUnit) {
return !!(ndUnit.offsetHeight && (ndUnit.offsetWidth || /\S/.test(ndUnit.textContent)))
return !!(
ndUnit.offsetHeight &&
(ndUnit.offsetWidth || /\S/.test(ndUnit.textContent))
)
}

const defaultProps = {
Expand Down Expand Up @@ -107,7 +110,7 @@ class HTMLEllipsis extends React.Component {
if (prevProps.winWidth !== this.props.winWidth) {
this.copyStyleToCanvas()
}
if (this.props !== prevProps) {
if (!_.isEqual(this.props, prevProps)) {
this.reflow(this.props)
}
}
Expand All @@ -125,7 +128,7 @@ class HTMLEllipsis extends React.Component {

initCanvas () {
if (this.canvas) return
const canvas = this.canvas = document.createElement('div')
const canvas = (this.canvas = document.createElement('div'))
canvas.className = `LinesEllipsis-canvas ${this.props.className}`
canvas.setAttribute('aria-hidden', 'true')
this.copyStyleToCanvas()
Expand All @@ -146,7 +149,9 @@ class HTMLEllipsis extends React.Component {
/* eslint-disable no-control-regex */
this.maxLine = +props.maxLine || 1
this.canvas.innerHTML = props.unsafeHTML
const basedOn = props.basedOn || (/^[\x00-\x7F]+$/.test(props.unsafeHTML) ? 'words' : 'letters')
const basedOn =
props.basedOn ||
(/^[\x00-\x7F]+$/.test(props.unsafeHTML) ? 'words' : 'letters')
hookNode(this.canvas, basedOn)
const clamped = this.putEllipsis(this.calcIndexes())
const newState = {
Expand All @@ -158,7 +163,9 @@ class HTMLEllipsis extends React.Component {

calcIndexes () {
const indexes = [0]
const nlUnits = this.nlUnits = Array.from(this.canvas.querySelectorAll('.LinesEllipsis-unit'))
const nlUnits = (this.nlUnits = Array.from(
this.canvas.querySelectorAll('.LinesEllipsis-unit')
))
const len = nlUnits.length
if (!nlUnits.length) return indexes

Expand Down Expand Up @@ -190,10 +197,11 @@ class HTMLEllipsis extends React.Component {
removeFollowingElementLeaves(ndPrevUnit, this.canvas)
findBlockAncestor(ndPrevUnit).appendChild(ndEllipsis)
ndPrevUnit = this.nlUnits.pop()
} while (ndPrevUnit && (
!affectLayout(ndPrevUnit) ||
ndEllipsis.offsetHeight > ndPrevUnit.offsetHeight ||
ndEllipsis.offsetTop > ndPrevUnit.offsetTop)
} while (
ndPrevUnit &&
(!affectLayout(ndPrevUnit) ||
ndEllipsis.offsetHeight > ndPrevUnit.offsetHeight ||
ndEllipsis.offsetTop > ndPrevUnit.offsetTop)
)

if (ndPrevUnit) {
Expand Down Expand Up @@ -229,11 +237,15 @@ class HTMLEllipsis extends React.Component {
const { component: Component, className, unsafeHTML, ...rest } = this.props
return (
<Component
className={`LinesEllipsis ${clamped ? 'LinesEllipsis--clamped' : ''} ${className}`}
ref={node => (this.target = node)}
className={`LinesEllipsis ${
clamped ? 'LinesEllipsis--clamped' : ''
} ${className}`}
ref={(node) => (this.target = node)}
{...omit(rest, usedProps)}
>
<div dangerouslySetInnerHTML={{ __html: clamped ? html : unsafeHTML }} />
<div
dangerouslySetInnerHTML={{ __html: clamped ? html : unsafeHTML }}
/>
</Component>
)
}
Expand Down
7 changes: 5 additions & 2 deletions src/index.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react'
import _ from 'lodash'
import ResizeObserver from 'resize-observer-polyfill'
import { canvasStyle, mirrorProps } from './common'
import { omit } from './helpers'
Expand Down Expand Up @@ -53,13 +54,15 @@ class LinesEllipsis extends React.Component {
if (prevProps.winWidth !== this.props.winWidth) {
this.copyStyleToCanvas()
}
if (this.props !== prevProps) {
if (!_.isEqual(this.props, prevProps)) {
this.reflow(this.props)
}
}

componentWillUnmount () {
this.resizeObserver.disconnect()
if (this.resizeObserver) {
this.resizeObserver.disconnect()
}
this.canvas.parentNode.removeChild(this.canvas)
}

Expand Down