Merge remote-tracking branch 'origin/vls-65' into vls-65

frontend-park-mail-ru · May 8, 2024 · 4669259 · 4669259
2 parents 20a2a2e + 9f15c16
commit 4669259
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/public/src/components/Editor/Editor.sass b/public/src/components/Editor/Editor.sass
@@ -61,7 +61,14 @@
 				content: "Введите '/' для комманд"
 				color: rgba(255, 255, 255, 0.7)
 				cursor: text
-				//animation: showAnim 0.5s
+				animation: fadeIn 0.3s
+
+				@keyframes fadeIn
+					0%
+						opacity: 0
+
+					99%
+						opacity: 1
 
 		.subnote-wrapper
 			background: $modal-background
@@ -70,6 +77,7 @@
 			transition: 0.2s ease
 			border: 1px solid #2b3b55
 			margin: 15px 2px
+			user-select: none
 
 			&:hover
 				cursor: pointer

diff --git a/public/src/components/LinkInput/LinkInput.tsx b/public/src/components/LinkInput/LinkInput.tsx
@@ -23,11 +23,20 @@ export class LinkInput extends ScReact.Component<any, any> {
 
     handleSubmit = () => {
         if (this.state.value) {
+            console.log(this.isUrlValid(this.state.value))
             this.props.onSubmit(this.state.value);
             this.clearValue();
         }
     };
 
+    isUrlValid(userInput) {
+        let res = userInput.match(/(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g);
+        if (res == null)
+            return false;
+        else
+            return true;
+    }
+
     render() {
         return (
             <div className={'link-input-container ' + (this.props.open ? 'open' : '')}>