@visns-studio/visns-components 1.4.8 → 1.4.9

package/components/cms/visns-data-grid.jsx

@@ -544,7 +544,13 @@ const DataGrid = ({
 						filterEditor: filterEditor,
 						filterEditorProps: filterEditorProps,
 						render: ({ data }) => {
-							if (data && data[column.id]) {
+							if (
+								data &&
+								data[column.id] &&
+								moment(data[column.id]).isValid() &&
+								moment(data[column.id]).format("YYYY-MM-DD") !==
+									"1970-01-01"
+							) {
 								const value = moment(data[column.id]).format(
 									column.format || "DD-MM-YYYY"
 								);
@@ -593,7 +599,13 @@ const DataGrid = ({
 						filterEditor: filterEditor,
 						filterEditorProps: filterEditorProps,
 						render: ({ data }) => {
-							if (data && data[column.id]) {
+							if (
+								data &&
+								data[column.id] &&
+								moment(data[column.id]).isValid() &&
+								moment(data[column.id]).format("YYYY-MM-DD") !==
+									"1970-01-01"
+							) {
 								data = moment(data[column.id]).format(
 									column.format
 										? column.format
@@ -986,7 +998,13 @@ const DataGrid = ({
 						...commonProps,
 						name: column.id,
 						render: ({ data }) => {
-							if (data && data[column.id]) {
+							if (
+								data &&
+								data[column.id] &&
+								moment(data[column.id]).isValid() &&
+								moment(data[column.id]).format("YYYY-MM-DD") !==
+									"1970-01-01"
+							) {
 								data = moment(data[column.id]).format(
 									column.format ? column.format : "hh:mm A"
 								);

package/components/crm/visns-autocomplete.jsx

@@ -4,7 +4,8 @@ import AwesomeDebouncePromise from "awesome-debounce-promise";
 import { ToggleOffFill, ToggleOnFill } from "akar-icons";
 
 const VisnsAutocomplete = (props) => {
-	const { api, country, onSelect, setFormData, field, inputValue } = props;
+	const { api, country, field, inputValue, onSelect, setFormData, style } =
+		props;
 	const [search, setSearch] = useState("");
 	const [results, setResults] = useState([]);
 	const [isLoading, setIsLoading] = useState(false);
@@ -18,8 +19,8 @@ const VisnsAutocomplete = (props) => {
 			} else {
 				let url = `https://api.mapbox.com/geocoding/v5/mapbox.places/${value}.json?types=address,poi&access_token=${api}`;
 
-				if (import.meta.env.VITE_MAPBOX_COUNTRY) {
-					url += `&country=${import.meta.env.VITE_MAPBOX_COUNTRY}`;
+				if (country) {
+					url += `&country=${country}`;
 				}
 
 				if (import.meta.env.hasOwnProperty("VITE_MAPBOX_PROXIMITY")) {
@@ -95,7 +96,12 @@ const VisnsAutocomplete = (props) => {
 			<div className="AutocompletePlace">
 				<input
 					className="AutocompletePlace-input"
-					style={{ height: "53px" }}
+					style={{
+						height:
+							style && style.multi_select_height
+								? style.multi_select_height
+								: "52px",
+					}}
 					type="text"
 					value={search || ""}
 					onChange={handleSearchChange}

package/components/crm/visns-data-grid.jsx

@@ -720,7 +720,14 @@ const DataGrid = forwardRef(
 							filterEditor: filterEditor,
 							filterEditorProps: filterEditorProps,
 							render: ({ data }) => {
-								if (data && data[column.id]) {
+								if (
+									data &&
+									data[column.id] &&
+									moment(data[column.id]).isValid() &&
+									moment(data[column.id]).format(
+										"YYYY-MM-DD"
+									) !== "1970-01-01"
+								) {
 									const value = moment(
 										data[column.id]
 									).format(column.format || "DD-MM-YYYY");
@@ -769,7 +776,14 @@ const DataGrid = forwardRef(
 							filterEditor: filterEditor,
 							filterEditorProps: filterEditorProps,
 							render: ({ data }) => {
-								if (data && data[column.id]) {
+								if (
+									data &&
+									data[column.id] &&
+									moment(data[column.id]).isValid() &&
+									moment(data[column.id]).format(
+										"YYYY-MM-DD"
+									) !== "1970-01-01"
+								) {
 									data = moment(data[column.id]).format(
 										column.format
 											? column.format
@@ -1186,7 +1200,14 @@ const DataGrid = forwardRef(
 							...commonProps,
 							name: column.id,
 							render: ({ data }) => {
-								if (data && data[column.id]) {
+								if (
+									data &&
+									data[column.id] &&
+									moment(data[column.id]).isValid() &&
+									moment(data[column.id]).format(
+										"YYYY-MM-DD"
+									) !== "1970-01-01"
+								) {
 									data = moment(data[column.id]).format(
 										column.format
 											? column.format
@@ -1445,6 +1466,7 @@ const DataGrid = forwardRef(
 						updateForm={setFormData}
 						columnId={formId}
 						childDropdownCallback={childDropdownCallback}
+						style={style}
 					/>
 				</Popup>
 			</>

package/components/crm/visns-field.jsx

@@ -15,25 +15,25 @@ import "react-toggle/style.css";
 import "react-quill/dist/quill.snow.css";
 import "react-datepicker/dist/react-datepicker.css";
 
-function Field(props) {
+function Field({
+	childDropdownCallback,
+	inputValue,
+	inputClass,
+	onChange,
+	onChangeDate,
+	onChangeSelect,
+	onChangeRicheditor,
+	onChangeToggle,
+	onChangeNumberFormat,
+	autocompleteCallback,
+	setFormData,
+	settings,
+	style,
+}) {
 	const [options, setOptions] = useState([]);
 	const [dataOptions, setDataOptions] = useState([]);
 	const [formItemStyle, setFormItemStyle] = useState({});
 	const [formItemClass, setFormItemClass] = useState("formItem");
-	const {
-		settings,
-		inputValue,
-		inputClass,
-		childDropdownCallback,
-		onChange,
-		onChangeDate,
-		onChangeSelect,
-		onChangeRicheditor,
-		onChangeToggle,
-		onChangeNumberFormat,
-		autocompleteCallback,
-		setFormData,
-	} = props;
 
 	useEffect(() => {
 		switch (settings.type) {
@@ -426,14 +426,13 @@ function Field(props) {
 						case "address":
 							htmlContainer = (
 								<VisnsAutocomplete
-									onSelect={(place) =>
-										autocompleteCallback(place)
-									}
-									field={settings.id}
-									setFormData={setFormData}
 									api="pk.eyJ1IjoidmlzbnMtc3R1ZGlvIiwiYSI6ImNrbGlraW5vZDBhMDYycHBsdmk5b3ljbGQifQ.ZGUBk0PWac5GahUeVHdTpg"
-									inputValue={inputValue}
 									country="AU"
+									field={settings.id}
+									inputValue={inputValue}
+									onSelect={autocompleteCallback}
+									setFormData={setFormData}
+									style={style}
 								/>
 							);
 							break;
@@ -481,6 +480,7 @@ function Field(props) {
 									}
 									options={settings.options}
 									dataOptions={dataOptions}
+									style={style}
 								/>
 							);
 							break;
@@ -500,6 +500,7 @@ function Field(props) {
 									}
 									options={options}
 									dataOptions={dataOptions}
+									style={style}
 								/>
 							);
 							break;