Skip to content

#6 add an option to repeat animation #63

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#6 add an option to repeat animation #63

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5899d4
#6 add an option to repeat animation
ammarbinfaisal1 Oct 24, 2018
1d6a66a
use setState method
ammarbinfaisal1 Oct 25, 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
78 changes: 43 additions & 35 deletions src/Typist.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default class Typist extends Component {
onLineTyped: PropTypes.func,
onTypingDone: PropTypes.func,
delayGenerator: PropTypes.func,
repeat: PropTypes.bool,
}

static defaultProps = {
Expand Down Expand Up @@ -85,8 +86,15 @@ export default class Typist extends Component {

onTypingDone = () => {
if (!this.mounted) { return; }
this.setState({ isDone: true });
this.props.onTypingDone();
if (this.props.repeat) {
setTimeout(() => {
this.setState({ textLines: [] });
this.typeAllLines();
}, this.props.startDelay);
} else {
this.setState({ isDone: true });
this.props.onTypingDone();
}
}

delayGenerator = (line, lineIdx, character, charIdx) => {
Expand All @@ -108,7 +116,7 @@ export default class Typist extends Component {

typeAllLines(lines = this.linesToType) {
return utils.eachPromise(lines, this.typeLine)
.then(() => this.onTypingDone());
.then(() => this.onTypingDone());
}

typeLine = (line, lineIdx) => {
Expand All @@ -130,9 +138,9 @@ export default class Typist extends Component {
return new Promise((resolve, reject) => {
this.setState({ textLines: this.state.textLines.concat(['']) }, () => {
utils.eachPromise(decoratedLine, this.typeCharacter, decoratedLine, lineIdx)
.then(() => onLineTyped(decoratedLine, lineIdx))
.then(resolve)
.catch(reject);
.then(() => onLineTyped(decoratedLine, lineIdx))
.then(resolve)
.catch(reject);
});
});
}
Expand All @@ -145,39 +153,39 @@ export default class Typist extends Component {
const textLines = this.state.textLines.slice();

utils.sleep(this.introducedDelay)
.then(() => {
this.introducedDelay = null;

const isBackspace = character === '🔙';
const isDelay = character === '⏰';
if (isDelay) {
resolve();
return;
}

if (isBackspace && lineIdx > 0) {
let prevLineIdx = lineIdx - 1;
let prevLine = textLines[prevLineIdx];

for (let idx = prevLineIdx; idx >= 0; idx --) {
if (prevLine.length > 0 && !ACTION_CHARS.includes(prevLine[0])) {
break;
}
prevLineIdx = idx;
prevLine = textLines[prevLineIdx];
.then(() => {
this.introducedDelay = null;

const isBackspace = character === '🔙';
const isDelay = character === '⏰';
if (isDelay) {
resolve();
return;
}

textLines[prevLineIdx] = prevLine.substr(0, prevLine.length - 1);
} else {
textLines[lineIdx] += character;
}
if (isBackspace && lineIdx > 0) {
let prevLineIdx = lineIdx - 1;
let prevLine = textLines[prevLineIdx];

this.setState({ textLines }, () => {
const delay = this.delayGenerator(line, lineIdx, character, charIdx);
onCharacterTyped(character, charIdx);
setTimeout(resolve, delay);
for (let idx = prevLineIdx; idx >= 0; idx--) {
if (prevLine.length > 0 && !ACTION_CHARS.includes(prevLine[0])) {
break;
}
prevLineIdx = idx;
prevLine = textLines[prevLineIdx];
}

textLines[prevLineIdx] = prevLine.substr(0, prevLine.length - 1);
} else {
textLines[lineIdx] += character;
}

this.setState({ textLines }, () => {
const delay = this.delayGenerator(line, lineIdx, character, charIdx);
onCharacterTyped(character, charIdx);
setTimeout(resolve, delay);
});
});
});
});
}

Expand Down