@dvrd/dvr-controls 0.0.35 → 0.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvrd/dvr-controls",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "description": "Custom web controls",
   "main": "index.ts",
   "scripts": {},

package/src/js/pdf/text/pdfText.tsx

@@ -34,6 +34,7 @@ interface Props {
 interface State {
     settings: PDFTextParams;
     dragging: boolean;
+    focused: boolean;
 }
 
 export default class PdfText extends PdfElement<Props, State> {
@@ -61,6 +62,7 @@ export default class PdfText extends PdfElement<Props, State> {
                 persistent: PDFElementPersist.NOT_PERSISTENT,
             }, props.defaultSettings),
             dragging: false,
+            focused: false,
         }
         this.currentText = this.state.settings.text;
         this.events = [this.event, {eventName: 'onLinkedElementMoved', handler: this.onLinkedElementMoved}]
@@ -68,14 +70,22 @@ export default class PdfText extends PdfElement<Props, State> {
 
     private onBlur = (evt: React.FocusEvent<HTMLTextAreaElement>) => {
         this.lastKnownCursor = evt.target.selectionEnd || 0;
+        this.setState({focused: false}, this.setWidth);
         if (this.state.settings.text !== this.currentText) this.props.onSaveHistory();
     };
 
     private onFocus = (evt: React.FocusEvent) => {
         evt.stopPropagation();
+        this.setState({focused: true}, this.setWidth);
         this.currentText = this.state.settings.text;
     };
 
+    getTextValue = (): string => {
+        const {settings, focused} = this.state, {values} = this.props;
+        if (focused) return settings.text;
+        return setPdfVariables(settings.text, values);
+    }
+
     public setSetting = (key: string, value: any, callback?: VoidFunction, save: boolean = true) => {
         this.setState({settings: Object.assign({}, this.state.settings, {[key]: value})}, () => {
             this.setWidth();
@@ -215,7 +225,6 @@ export default class PdfText extends PdfElement<Props, State> {
     render = () => {
         const {settings, dragging} = this.state, {
             draggable,
-            values,
             defaultPosition,
             onSaveHistory,
             persistent
@@ -234,7 +243,7 @@ export default class PdfText extends PdfElement<Props, State> {
                     <div className='pdf-text-container'>
                     <textarea className='pdf-text-input' style={this.getTextStyle()}
                               readOnly={settings.disabled === true}
-                              value={sanitizeHtml(setPdfVariables(settings.text, values))} onChange={this.onChange}
+                              value={sanitizeHtml(this.getTextValue())} onChange={this.onChange}
                               rows={this.getRows()} onFocus={this.onFocus} onBlur={this.onBlur} onClick={this.onClick}
                               ref={(ref: HTMLTextAreaElement) => {
                                   this.field = ref

package/src/js/textField/dvrdNumberInput.tsx

@@ -33,6 +33,7 @@ interface Props {
     asCurrency: boolean;
     autoSelect?: boolean;
 }
+// TODO Add option to disable symbols (+,-)
 
 export default class DvrdNumberInput extends PureComponent<Props> {
     static defaultProps = {